Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into release

This commit is contained in:
snowleo 2011-11-17 19:06:44 +01:00
parent adcffba7cf 41c03853ab
commit 7ecc3c25b0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
View File

@ -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());
}