minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-06 06:37:28 +02:00
Code Issues Releases Wiki Activity

Fix startup errors

Browse Source
This commit is contained in:
snowleo
2012-10-06 11:06:52 +02:00
parent 21b2e4b072
commit f2e31e56c5
10 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/net/ess3/api/IPlugin.java
View File

@@ -11,6 +11,8 @@ public interface IPlugin extends Plugin {
int scheduleAsyncDelayedTask(final Runnable run);
int scheduleSyncDelayedTask(final Runnable run);
int scheduleAsyncDelayedTask(final Runnable run, final long delay);
int scheduleSyncDelayedTask(final Runnable run, final long delay);

6
Essentials/src/net/ess3/bukkit/BukkitPlugin.java
View File

@@ -128,6 +128,12 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin
{
return getServer().getScheduler().scheduleSyncDelayedTask(this, run);
}
@Override
public int scheduleAsyncDelayedTask(final Runnable run, final long delay)
{
return getServer().getScheduler().scheduleAsyncDelayedTask(this, run, delay);
}
@Override
public int scheduleSyncDelayedTask(final Runnable run, final long delay)

19
Essentials/src/net/ess3/metrics/MetricsListener.java
View File

@@ -1,6 +1,11 @@
package net.ess3.metrics;
import java.util.logging.Level;
import lombok.Cleanup;
import net.ess3.api.IEssentials;
import net.ess3.api.ISettings;
import net.ess3.api.IUser;
import net.ess3.permissions.Permissions;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@@ -24,14 +29,18 @@ public class MetricsListener implements Listener
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(final PlayerJoinEvent event)
{
/*final IUser player = ess.getUserMap().getUser(event.getPlayer());
if (ess.getSettings().isMetricsEnabled() == false && (player.isAuthorized("essentials.essentials") || player.isAuthorized("bukkit.broadcast.admin")))
final IUser player = ess.getUserMap().getUser(event.getPlayer());
@Cleanup
ISettings settings = ess.getSettings();
settings.acquireReadLock();
if (settings.getData().getGeneral().getMetricsEnabled() == null && (Permissions.ESSENTIALS.isAuthorized(event.getPlayer()) || event.getPlayer().hasPermission("bukkit.broadcast.admin")))
{
player.sendMessage("PluginMetrics collects minimal statistic data, starting in about 5 minutes.");
player.sendMessage("To opt out, run /essentials opt-out");
ess.getLogger().log(Level.INFO, "[Metrics] Admin join - Starting 5 minute opt-out period.");
ess.getSettings().setMetricsEnabled(true);
ess.getScheduler().scheduleAsyncDelayedTask(ess, starter, 5 * 1200);
}*/
settings.acquireWriteLock();
settings.getData().getGeneral().setMetricsEnabled(true);
ess.getPlugin().scheduleAsyncDelayedTask(starter, 5 * 1200);
}
}
}

4
Essentials/src/net/ess3/metrics/MetricsStarter.java
View File

@@ -43,11 +43,11 @@ public class MetricsStarter implements Runnable
settings.acquireReadLock();
if (!metrics.isOptOut())
{
if (settings.getData().getGeneral().isMetricsEnabled())
if (settings.getData().getGeneral().getMetricsEnabled() == true)
{
start = true;
}
else
else if (settings.getData().getGeneral().getMetricsEnabled() == null)
{
ess.getLogger().info("This plugin collects minimal statistic data and sends it to http://metrics.essentials3.net.");
ess.getLogger().info("You can opt out by running /essentials opt-out");

1
Essentials/src/net/ess3/permissions/Permissions.java
View File

@@ -25,6 +25,7 @@ public enum Permissions implements IPermission
DELHOME_OTHERS,
ECO_LOAN(PermissionDefault.FALSE),
ENDERCHEST_OTHERS,
ESSENTIALS,
EXP_GIVE,
EXP_GIVE_OTHERS,
EXP_SET,

2
Essentials/src/net/ess3/settings/General.java
View File

@@ -77,5 +77,5 @@ public class General implements StorageObject
{
return loginAttackDelay * 1000;
}
public boolean metricsEnabled = true;
public Boolean metricsEnabled = null;
}

2
Essentials2Compat/src/plugin.yml
View File

@@ -1,5 +1,5 @@
name: Essentials
main: net.ess3.Essentials
main: com.earth2me.essentials.Essentials
version: 2.9
website: http://tiny.cc/EssentialsWiki
description: Compatibility plugin for older plugins

3
EssentialsGeoIP/src/net/ess3/geoip/EssentialsGeoIPPlayerListener.java
View File

@@ -167,6 +167,9 @@ public class EssentialsGeoIPPlayerListener implements Listener, IReload
LOGGER.log(Level.SEVERE, _("geoIpUrlEmpty"));
return;
}
if (!databaseFile.getAbsoluteFile().getParentFile().exists()) {
databaseFile.getAbsoluteFile().getParentFile().mkdirs();
}
InputStream input = null;
OutputStream output = null;
try

3
EssentialsProtect/src/net/ess3/protect/EssentialsConnect.java
View File

@@ -4,6 +4,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
import net.ess3.bukkit.BukkitPlugin;
import org.bukkit.plugin.Plugin;
@@ -19,7 +20,7 @@ public class EssentialsConnect
{
LOGGER.log(Level.WARNING, _("versionMismatchAll"));
}
ess = (IEssentials)essPlugin;
ess = ((BukkitPlugin)essPlugin).getEssentials();
protect = (IProtect)essProtect;
protect.setSettings(new ProtectHolder(ess));
}

1
EssentialsXMPP/pom.xml
View File

@@ -41,7 +41,6 @@
<include>jivesoftware:smack</include>
</includes>
</artifactSet>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>