Listener Cleanup

5 files changed, 27 insertions, 21 deletions

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index 17f0f1778..3423da9d0 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -20,14 +20,14 @@ public class EssentialsBlockListener implements Listener
 	@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
-		final User user = ess.getUser(event.getPlayer());
 		// Do not rely on getItemInHand();
-		// http://leaky.bukkit.org/issues/663
+		// http://leaky.bukkit.org/issues/663		
 		final ItemStack is = Util.convertBlockToItem(event.getBlockPlaced());
 		if (is == null)
 		{
 			return;
 		}
+		final User user = ess.getUser(event.getPlayer());
 		final boolean unlimitedForUser = user.hasUnlimited(is);
 		if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
 		{
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index f63bdd335..7ee6a7057 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -383,6 +383,7 @@ public class Settings implements ISettings
 		noGodWorlds = new HashSet<String>(config.getStringList("no-god-in-worlds"));
 		enabledSigns = _getEnabledSigns();
 		teleportInvulnerability = _isTeleportInvulnerability();
+		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
 		itemSpawnBl = _getItemSpawnBlacklist();
 		kits = _getKits();
 		chatFormats.clear();
@@ -695,10 +696,16 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("register-back-in-listener", false);
 	}
+	private boolean disableItemPickupWhileAfk;
 
 	@Override
 	public boolean getDisableItemPickupWhileAfk()
 	{
+		return disableItemPickupWhileAfk;
+	}
+
+	private boolean _getDisableItemPickupWhileAfk()
+	{
 		return config.getBoolean("disable-item-pickup-while-afk", true);
 	}
 
@@ -746,7 +753,6 @@ public class Settings implements ISettings
 	{
 		this.metricsEnabled = metricsEnabled;
 	}
-	
 	private boolean teleportInvulnerability;
 
 	@Override
@@ -754,12 +760,12 @@ public class Settings implements ISettings
 	{
 		return config.getLong("teleport-invulnerability", 0) * 1000;
 	}
-	
+
 	private boolean _isTeleportInvulnerability()
 	{
 		return (config.getLong("teleport-invulnerability", 0) > 0);
 	}
-	
+
 	@Override
 	public boolean isTeleportInvulnerability()
 	{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index 8acca9804..72367e514 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -25,10 +25,10 @@ public class SignBlockListener implements Listener
 		this.ess = ess;
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onBlockBreak(final BlockBreakEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
@@ -76,10 +76,10 @@ public class SignBlockListener implements Listener
 		return false;
 	}
 
-	@EventHandler(priority = EventPriority.HIGHEST)
+	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onSignChange(final SignChangeEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
@@ -107,10 +107,10 @@ public class SignBlockListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onBlockPlace(final BlockPlaceEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
@@ -141,10 +141,10 @@ public class SignBlockListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onBlockBurn(final BlockBurnEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
@@ -169,10 +169,10 @@ public class SignBlockListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onBlockIgnite(final BlockIgniteEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
index a0446179f..8ca64869c 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -43,10 +43,10 @@ public class SignEntityListener implements Listener
 		}
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onEntityChangeBlock(final EntityChangeBlockEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
index f891c0fdb..75ed18500 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
@@ -20,10 +20,10 @@ public class SignPlayerListener implements Listener
 		this.ess = ess;
 	}
 
-	@EventHandler(priority = EventPriority.LOW)
+	@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
 	public void onPlayerInteract(final PlayerInteractEvent event)
 	{
-		if (event.isCancelled() || ess.getSettings().areSignsDisabled())
+		if (ess.getSettings().areSignsDisabled())
 		{
 			return;
 		}
@@ -33,8 +33,8 @@ public class SignPlayerListener implements Listener
 		{
 			return;
 		}
-		final int mat = block.getTypeId();
-		if (mat == Material.SIGN_POST.getId() || mat == Material.WALL_SIGN.getId())
+
+		if (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)
 		{
 			if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
 			{