summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-06-10 19:40:09 +0100
committerKHobbits <rob@khobbits.co.uk>2012-06-10 19:40:09 +0100
commit555ec29f91500752eb6e50d6b4d6a68d4df98e4b (patch)
treefd564212e730c78062557970c68045d60ce5783f
parent0d4cece3909499c04359d6abd5f06d942bb0572b (diff)
downloadEssentials-555ec29f91500752eb6e50d6b4d6a68d4df98e4b.tar
Essentials-555ec29f91500752eb6e50d6b4d6a68d4df98e4b.tar.gz
Essentials-555ec29f91500752eb6e50d6b4d6a68d4df98e4b.tar.lz
Essentials-555ec29f91500752eb6e50d6b4d6a68d4df98e4b.tar.xz
Essentials-555ec29f91500752eb6e50d6b4d6a68d4df98e4b.zip
Missing event aborts in sign code.
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java10
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java5
2 files changed, 15 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index ccd40b214..c159510c7 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -199,6 +199,11 @@ public class SignBlockListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonExtend(final BlockPistonExtendEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
for (Block block : event.getBlocks())
{
if (((block.getTypeId() == WALL_SIGN
@@ -224,6 +229,11 @@ public class SignBlockListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onBlockPistonRetract(final BlockPistonRetractEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
if (event.isSticky())
{
final Block block = event.getBlock();
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
index 5a6ee177d..edc5b856d 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -22,6 +22,11 @@ public class SignEntityListener implements Listener
@EventHandler(priority = EventPriority.LOW)
public void onEntityExplode(final EntityExplodeEvent event)
{
+ if (ess.getSettings().areSignsDisabled())
+ {
+ return;
+ }
+
for (Block block : event.blockList())
{
if (((block.getTypeId() == Material.WALL_SIGN.getId()