mirror of
https://github.com/EssentialsX/Essentials.git
synced 2025-01-01 14:07:46 +01:00
Merge branch 'refs/heads/master' into release
This commit is contained in:
commit
7ecc3c25b0
@ -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());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user