From 301b609e9357a21931653baffe9c3bed1f06dd8f Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 3 Mar 2012 05:27:02 +0000 Subject: [PATCH] *make it look like i'm doing something* --- .../essentials/EssentialsBlockListener.java | 2 +- .../essentials/EssentialsPlayerListener.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java index 648bfcef5..f2e2e8a77 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java @@ -32,7 +32,7 @@ public class EssentialsBlockListener implements Listener { return; } - boolean unlimitedForUser = user.hasUnlimited(is); + final boolean unlimitedForUser = user.hasUnlimited(is); if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL) { ess.scheduleSyncDelayedTask( diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 76668b615..7ab1847f1 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -182,15 +182,16 @@ public class EssentialsPlayerListener implements Listener @EventHandler(priority = EventPriority.HIGH) public void onPlayerLogin(final PlayerLoginEvent event) { - switch (event.getResult()) { + switch (event.getResult()) + { case ALLOWED: case KICK_FULL: - case KICK_BANNED: + case KICK_BANNED: break; default: - return; + return; } - + User user = ess.getUser(event.getPlayer()); user.setNPC(false); @@ -199,7 +200,7 @@ public class EssentialsPlayerListener implements Listener user.checkMuteTimeout(currentTime); user.checkJailTimeout(currentTime); - if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) + if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) { final String banReason = user.getBanReason(); event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason")); @@ -291,7 +292,7 @@ public class EssentialsPlayerListener implements Listener { for (Player player : ess.getServer().getOnlinePlayers()) { - User spyer = ess.getUser(player); + final User spyer = ess.getUser(player); if (spyer.isSocialSpyEnabled() && !user.equals(spyer)) { player.sendMessage(user.getDisplayName() + " : " + event.getMessage()); @@ -400,7 +401,7 @@ public class EssentialsPlayerListener implements Listener } @EventHandler(priority = EventPriority.LOW) - public void onPlayerPickupItem(PlayerPickupItemEvent event) + public void onPlayerPickupItem(final PlayerPickupItemEvent event) { if (event.isCancelled() || !ess.getSettings().getDisableItemPickupWhileAfk()) {