diff options
| author | snowleo <schneeleo@gmail.com> | 2011-11-17 19:06:44 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-11-17 19:06:44 +0100 |
| commit | 7ecc3c25b01b718aa0b21774cc0289ba3c64a394 (patch) | |
| tree | 8ace8ff985975f0687963c9bef8fba5346223e8e | |
| parent | adcffba7cf5e45a1dcd35ee9f6c1a65688b8c61e (diff) | |
| parent | 41c03853ab5774a24722bf0446a21c5e9678eeb8 (diff) | |
| download | Essentials-7ecc3c25b01b718aa0b21774cc0289ba3c64a394.tar Essentials-7ecc3c25b01b718aa0b21774cc0289ba3c64a394.tar.gz Essentials-7ecc3c25b01b718aa0b21774cc0289ba3c64a394.tar.lz Essentials-7ecc3c25b01b718aa0b21774cc0289ba3c64a394.tar.xz Essentials-7ecc3c25b01b718aa0b21774cc0289ba3c64a394.zip | |
Merge branch 'refs/heads/master' into releasestable-2.6.5
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java | 6 |
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()); } |