diff options
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java index 0e3fb6a5e..cdd0c2543 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java @@ -9,10 +9,13 @@ import java.util.List; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; import org.bukkit.event.block.*; -public class EssentialsProtectBlockListener extends BlockListener +public class EssentialsProtectBlockListener implements Listener { final private transient IProtect prot; final private transient IEssentials ess; @@ -23,7 +26,7 @@ public class EssentialsProtectBlockListener extends BlockListener this.ess = prot.getEssentialsConnect().getEssentials(); } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onBlockPlace(final BlockPlaceEvent event) { if (event.isCancelled()) @@ -102,7 +105,7 @@ public class EssentialsProtectBlockListener extends BlockListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onBlockIgnite(BlockIgniteEvent event) { if (event.isCancelled()) @@ -162,7 +165,7 @@ public class EssentialsProtectBlockListener extends BlockListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onBlockFromTo(final BlockFromToEvent event) { if (event.isCancelled()) @@ -211,7 +214,7 @@ public class EssentialsProtectBlockListener extends BlockListener } } - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onBlockBurn(final BlockBurnEvent event) { if (event.isCancelled()) @@ -257,7 +260,7 @@ public class EssentialsProtectBlockListener extends BlockListener BlockFace.SELF }; - @Override + @EventHandler(priority = EventPriority.HIGHEST) public void onBlockBreak(final BlockBreakEvent event) { if (event.isCancelled()) @@ -363,8 +366,8 @@ public class EssentialsProtectBlockListener extends BlockListener } } - @Override - public void onBlockPistonExtend(BlockPistonExtendEvent event) + @EventHandler(priority = EventPriority.HIGHEST) + public void onBlockPistonExtend(final BlockPistonExtendEvent event) { if (event.isCancelled()) { @@ -425,8 +428,8 @@ public class EssentialsProtectBlockListener extends BlockListener } } - @Override - public void onBlockPistonRetract(BlockPistonRetractEvent event) + @EventHandler(priority = EventPriority.HIGHEST) + public void onBlockPistonRetract(final BlockPistonRetractEvent event) { if (event.isCancelled() || !event.isSticky()) { @@ -479,6 +482,7 @@ public class EssentialsProtectBlockListener extends BlockListener } } } + finally { settings.unlock(); @@ -521,7 +525,8 @@ public class EssentialsProtectBlockListener extends BlockListener } } - if (settings.getData().getSignsAndRails().isProtectRails()) { + if (settings.getData().getSignsAndRails().isProtectRails()) + { if (type == Material.RAILS || type == Material.POWERED_RAIL || type == Material.DETECTOR_RAIL) { return prot.getStorage().isProtected(block, user.getName()); |