summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-12-30 04:32:20 +0000
committerKHobbits <rob@khobbits.co.uk>2012-12-30 04:32:43 +0000
commitf5e46a7b41d6707bf5f618e1e170ca9f401e6c5b (patch)
tree6f6e08a004cb3f4ebb65db1705687a68d0388481
parent5347f177ce9fcb2dee44df74948d3f0c4e4afd71 (diff)
downloadEssentials-f5e46a7b41d6707bf5f618e1e170ca9f401e6c5b.tar
Essentials-f5e46a7b41d6707bf5f618e1e170ca9f401e6c5b.tar.gz
Essentials-f5e46a7b41d6707bf5f618e1e170ca9f401e6c5b.tar.lz
Essentials-f5e46a7b41d6707bf5f618e1e170ca9f401e6c5b.tar.xz
Essentials-f5e46a7b41d6707bf5f618e1e170ca9f401e6c5b.zip
Implement event toggle.
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java12
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignProtection.java6
5 files changed, 21 insertions, 9 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index e5f125cf8..aeecf5368 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -17,6 +17,7 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsSign
{
private static final Set<Material> EMPTY_SET = new HashSet<Material>();
+
protected transient final String signName;
public EssentialsSign(final String signName)
@@ -258,6 +259,11 @@ public class EssentialsSign
{
return EMPTY_SET;
}
+
+ public boolean areHeavyEventRequired()
+ {
+ return false;
+ }
protected final void validateTrade(final ISign sign, final int index, final IEssentials ess) throws SignException
{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index 517c313cc..a48ca3924 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -65,7 +65,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockBreak(block, player, ess))
{
LOGGER.log(Level.INFO, "A block was protected by a sign.");
@@ -148,7 +148,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockPlace(block, event.getPlayer(), ess))
{
event.setCancelled(true);
@@ -176,7 +176,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockBurn(block, ess))
{
event.setCancelled(true);
@@ -204,7 +204,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockIgnite(block, ess))
{
event.setCancelled(true);
@@ -233,7 +233,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockPush(block, ess))
{
event.setCancelled(true);
@@ -264,7 +264,7 @@ public class SignBlockListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockPush(block, ess))
{
event.setCancelled(true);
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
index edc5b856d..bb188f94f 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -39,7 +39,7 @@ public class SignEntityListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType()))
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType()))
{
event.setCancelled(!sign.onBlockExplode(block, ess));
return;
@@ -67,7 +67,7 @@ public class SignEntityListener implements Listener
}
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockBreak(block, ess))
{
event.setCancelled(true);
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
index 12296b023..35fa03f3f 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
@@ -77,7 +77,7 @@ public class SignPlayerListener implements Listener
{
for (EssentialsSign sign : ess.getSettings().enabledSigns())
{
- if (sign.getBlocks().contains(block.getType())
+ if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())
&& !sign.onBlockInteract(block, event.getPlayer(), ess))
{
event.setCancelled(true);
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
index 1ea26c859..b5a679324 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java
@@ -241,6 +241,12 @@ public class SignProtection extends EssentialsSign
{
return protectedBlocks;
}
+
+ @Override
+ public boolean areHeavyEventRequired()
+ {
+ return true;
+ }
@Override
protected boolean onBlockPlace(final Block block, final User player, final String username, final IEssentials ess) throws SignException