summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-17 17:06:06 +0100
committersnowleo <schneeleo@gmail.com>2011-11-17 17:06:06 +0100
commit41c03853ab5774a24722bf0446a21c5e9678eeb8 (patch)
tree8ace8ff985975f0687963c9bef8fba5346223e8e
parent2a4c26ee693d66edf175e631952e8d32fa003613 (diff)
downloadEssentials-41c03853ab5774a24722bf0446a21c5e9678eeb8.tar
Essentials-41c03853ab5774a24722bf0446a21c5e9678eeb8.tar.gz
Essentials-41c03853ab5774a24722bf0446a21c5e9678eeb8.tar.lz
Essentials-41c03853ab5774a24722bf0446a21c5e9678eeb8.tar.xz
Essentials-41c03853ab5774a24722bf0446a21c5e9678eeb8.zip
General fix against overwriting already existing protections
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
index 7f96750e4..db574fe22 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
@@ -75,7 +75,8 @@ public class EssentialsProtectBlockListener extends BlockListener
&& user.isAuthorized("essentials.protect"))
{
protect.add(blockPlaced);
- if (prot.getSettingBool(ProtectConfig.protect_below_rails))
+ if (prot.getSettingBool(ProtectConfig.protect_below_rails)
+ && !prot.getStorage().isProtected(blockPlaced.getRelative(BlockFace.DOWN), user.getName()))
{
protect.add(blockPlaced.getRelative(BlockFace.DOWN));
}
@@ -87,7 +88,8 @@ public class EssentialsProtectBlockListener extends BlockListener
protect.add(blockPlaced);
if (prot.getSettingBool(ProtectConfig.protect_against_signs)
&& event.getBlockAgainst().getType() != Material.SIGN_POST
- && event.getBlockAgainst().getType() != Material.WALL_SIGN)
+ && event.getBlockAgainst().getType() != Material.WALL_SIGN
+ && !prot.getStorage().isProtected(event.getBlockAgainst(), user.getName()))
{
protect.add(event.getBlockAgainst());
}