diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-01-04 21:40:02 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-01-04 21:40:02 +0000 |
| commit | 74c4c604da980e0cba9b88e62d93c01ff5b049c9 (patch) | |
| tree | 48f73faa87d04832173e4453808887ce492938e5 | |
| parent | 121f09caf076bfd8ff9bf0da4d2c68f9a12565c2 (diff) | |
| parent | 0937a35470a42f7fbb41bdd8c65ae4a9547c640b (diff) | |
| download | Essentials-74c4c604da980e0cba9b88e62d93c01ff5b049c9.tar Essentials-74c4c604da980e0cba9b88e62d93c01ff5b049c9.tar.gz Essentials-74c4c604da980e0cba9b88e62d93c01ff5b049c9.tar.lz Essentials-74c4c604da980e0cba9b88e62d93c01ff5b049c9.tar.xz Essentials-74c4c604da980e0cba9b88e62d93c01ff5b049c9.zip | |
Merge branch 'release' into 2.9
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java index ab914c629..fce49958e 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -44,6 +44,13 @@ public class SignBlockListener implements Listener public boolean protectSignsAndBlocks(final Block block, final Player player) { + // prevent any signs be broken by destroying the block they are attached to + if (EssentialsSign.checkIfBlockBreaksSigns(block)) + { + LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign."); + return true; + } + final int mat = block.getTypeId(); if (mat == SIGN_POST || mat == WALL_SIGN) { @@ -58,12 +65,7 @@ public class SignBlockListener implements Listener } } } - // prevent any signs be broken by destroying the block they are attached to - if (EssentialsSign.checkIfBlockBreaksSigns(block)) - { - LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign."); - return true; - } + for (EssentialsSign sign : ess.getSettings().enabledSigns()) { if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType()) |