diff --git a/Essentials/src/com/earth2me/essentials/Backup.java b/Essentials/src/com/earth2me/essentials/Backup.java index aa8334310..5ace61e98 100644 --- a/Essentials/src/com/earth2me/essentials/Backup.java +++ b/Essentials/src/com/earth2me/essentials/Backup.java @@ -146,7 +146,7 @@ public class Backup implements Runnable } finally { - ess.scheduleSyncDelayedTask(new Runnable() + class BackupEnableSaveTask implements Runnable { @Override public void run() @@ -159,7 +159,8 @@ public class Backup implements Runnable active = false; LOGGER.log(Level.INFO, tl("backupFinished")); } - }); + } + ess.scheduleSyncDelayedTask(new BackupEnableSaveTask()); } } }); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java index ea806eea7..0a5908899 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java @@ -56,8 +56,7 @@ public class EssentialsBlockListener implements Listener final User user = ess.getUser(event.getPlayer()); if (user.hasUnlimited(is) && user.getBase().getGameMode() == GameMode.SURVIVAL) { - ess.scheduleSyncDelayedTask( - new Runnable() + class UnlimitedItemSpawnTask implements Runnable { @Override public void run() @@ -65,7 +64,8 @@ public class EssentialsBlockListener implements Listener user.getBase().getInventory().addItem(is); user.getBase().updateInventory(); } - }); + } + ess.scheduleSyncDelayedTask(new UnlimitedItemSpawnTask()); } } } diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index b99311805..5e3bbb1d0 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -55,7 +55,7 @@ public class EssentialsEntityListener implements Listener attacker.updateActivity(true); } else if (eAttack instanceof Projectile && eDefend instanceof Player) - { + { final Projectile projectile = (Projectile)event.getDamager(); //This should return a ProjectileSource on 1.7.3 beta + final Object shooter = projectile.getShooter(); @@ -105,8 +105,8 @@ public class EssentialsEntityListener implements Listener final String command = powertoolPlayer.matcher(tempCommand).replaceAll(defender.getName()); if (command != null && !command.isEmpty() && !command.equals(tempCommand)) { - ess.scheduleSyncDelayedTask( - new Runnable() + + class PowerToolInteractTask implements Runnable { @Override public void run() @@ -114,7 +114,8 @@ public class EssentialsEntityListener implements Listener attacker.getServer().dispatchCommand(attacker.getBase(), command); LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", attacker.getName(), command)); } - }); + } + ess.scheduleSyncDelayedTask(new PowerToolInteractTask()); event.setCancelled(true); return; diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 8e6d46958..94feafa89 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -220,7 +220,7 @@ public class EssentialsPlayerListener implements Listener dUser.checkMuteTimeout(currentTime); dUser.updateActivity(false); - ess.scheduleSyncDelayedTask(new Runnable() + class DelayJoinTask implements Runnable { @Override public void run() @@ -319,7 +319,9 @@ public class EssentialsPlayerListener implements Listener user.getBase().setWalkSpeed(0.2f); } - }); + } + + ess.scheduleSyncDelayedTask(new DelayJoinTask()); } // Makes the compass item ingame always point to the first essentials home. #EasterEgg @@ -573,8 +575,7 @@ public class EssentialsPlayerListener implements Listener { final Location otarget = LocationUtil.getTarget(user.getBase()); - ess.scheduleSyncDelayedTask( - new Runnable() + class DelayedClickJumpTask implements Runnable { @Override public void run() @@ -588,7 +589,8 @@ public class EssentialsPlayerListener implements Listener } user.getBase().teleport(loc, TeleportCause.PLUGIN); } - }); + } + ess.scheduleSyncDelayedTask(new DelayedClickJumpTask()); } catch (Exception ex) { @@ -622,8 +624,8 @@ public class EssentialsPlayerListener implements Listener else { used = true; - ess.scheduleSyncDelayedTask( - new Runnable() + + class PowerToolUseTask implements Runnable { @Override public void run() @@ -631,7 +633,9 @@ public class EssentialsPlayerListener implements Listener user.getServer().dispatchCommand(user.getBase(), command); LOGGER.log(Level.INFO, String.format("[PT] %s issued server command: /%s", user.getName(), command)); } - }); + } + ess.scheduleSyncDelayedTask(new PowerToolUseTask()); + } } return used; diff --git a/Essentials/src/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/com/earth2me/essentials/TimedTeleport.java index 6b9e88f97..e426c1cec 100644 --- a/Essentials/src/com/earth2me/essentials/TimedTeleport.java +++ b/Essentials/src/com/earth2me/essentials/TimedTeleport.java @@ -89,7 +89,7 @@ public class TimedTeleport implements Runnable return; } - ess.scheduleSyncDelayedTask(new Runnable() + class DelayedTeleportTask implements Runnable { @Override public void run() @@ -146,7 +146,8 @@ public class TimedTeleport implements Runnable } } } - }); + } + ess.scheduleSyncDelayedTask(new DelayedTeleportTask()); } //If we need to cancelTimer a pending teleportPlayer call this method diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java index 89e90797b..507e1d7d3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java @@ -31,7 +31,8 @@ public class Commandkittycannon extends EssentialsCommand ocelot.setTamed(true); ocelot.setBaby(); ocelot.setVelocity(user.getBase().getEyeLocation().getDirection().multiply(2)); - ess.scheduleSyncDelayedTask(new Runnable() + + class KittyCannonExplodeTask implements Runnable { @Override public void run() @@ -40,6 +41,8 @@ public class Commandkittycannon extends EssentialsCommand ocelot.remove(); loc.getWorld().createExplosion(loc, 0F); } - }, 20); + } + ess.scheduleSyncDelayedTask(new KittyCannonExplodeTask(), 20); + } } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java index 7ee8f8180..823ee17f4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsudo.java @@ -27,7 +27,7 @@ public class Commandsudo extends EssentialsCommand } final User user = getPlayer(server, sender, args, 0); - if(args[1].toLowerCase(Locale.ENGLISH).startsWith("c:")) + if (args[1].toLowerCase(Locale.ENGLISH).startsWith("c:")) { if (user.isAuthorized("essentials.sudo.exempt") && sender.isPlayer()) { @@ -53,18 +53,19 @@ public class Commandsudo extends EssentialsCommand final PluginCommand execCommand = ess.getServer().getPluginCommand(command); if (execCommand != null) { - ess.scheduleSyncDelayedTask( - new Runnable() - { - @Override - public void run() - { - LOGGER.log(Level.INFO, String.format("[Sudo] %s issued server command: /%s %s", user.getName(), command, getFinalArg(arguments, 0))); - execCommand.execute(user.getBase(), command, arguments); - } - }); + class SudoCommandTask implements Runnable + { + @Override + public void run() + { + LOGGER.log(Level.INFO, String.format("[Sudo] %s issued server command: /%s %s", user.getName(), command, getFinalArg(arguments, 0))); + execCommand.execute(user.getBase(), command, arguments); + } + } + ess.scheduleSyncDelayedTask(new SudoCommandTask()); } - else { + else + { sender.sendMessage(tl("errorCallingCommand", command)); } }