diff options
Diffstat (limited to 'Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java')
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java index e116a8fb5..e3046c95b 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java @@ -19,8 +19,8 @@ public class SignBlockListener implements Listener { private final transient IEssentials ess; private final static Logger LOGGER = Logger.getLogger("Minecraft"); - private final static int WALL_SIGN = Material.WALL_SIGN.getId(); - private final static int SIGN_POST = Material.SIGN_POST.getId(); + private final static Material WALL_SIGN = Material.WALL_SIGN; + private final static Material SIGN_POST = Material.SIGN_POST; public SignBlockListener(IEssentials ess) { @@ -51,7 +51,7 @@ public class SignBlockListener implements Listener return true; } - final int mat = block.getTypeId(); + final Material mat = block.getType(); if (mat == SIGN_POST || mat == WALL_SIGN) { final Sign csign = (Sign)block.getState(); @@ -139,16 +139,16 @@ public class SignBlockListener implements Listener } final Block against = event.getBlockAgainst(); - if ((against.getTypeId() == WALL_SIGN - || against.getTypeId() == SIGN_POST) + if ((against.getType() == WALL_SIGN + || against.getType() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(against))) { event.setCancelled(true); return; } final Block block = event.getBlock(); - if (block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (block.getType() == WALL_SIGN + || block.getType() == SIGN_POST) { return; } @@ -173,8 +173,8 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (((block.getType() == WALL_SIGN + || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { @@ -202,8 +202,8 @@ public class SignBlockListener implements Listener } final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (((block.getType() == WALL_SIGN + || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { @@ -232,8 +232,8 @@ public class SignBlockListener implements Listener for (Block block : event.getBlocks()) { - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (((block.getType() == WALL_SIGN + || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { @@ -264,8 +264,8 @@ public class SignBlockListener implements Listener if (event.isSticky()) { final Block block = event.getBlock(); - if (((block.getTypeId() == WALL_SIGN - || block.getTypeId() == SIGN_POST) + if (((block.getType() == WALL_SIGN + || block.getType() == SIGN_POST) && EssentialsSign.isValidSign(new EssentialsSign.BlockSign(block))) || EssentialsSign.checkIfBlockBreaksSigns(block)) { |