minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-26 16:04:27 +02:00
Code Issues Releases Wiki Activity

Merge branch 'release' into 2.9

Browse Source
This commit is contained in:
KHobbits
2013-01-04 21:40:02 +00:00
parent 9745984904 a7e567e309
commit 9cebdd1c8b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
View File

@@ -44,6 +44,13 @@ public class SignBlockListener implements Listener
public boolean protectSignsAndBlocks(final Block block, final Player player) public boolean protectSignsAndBlocks(final Block block, final Player player)
{ {
// prevent any signs be broken by destroying the block they are attached to
if (EssentialsSign.checkIfBlockBreaksSigns(block))
{
LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign.");
return true;
}
final int mat = block.getTypeId(); final int mat = block.getTypeId();
if (mat == SIGN_POST || mat == WALL_SIGN) if (mat == SIGN_POST || mat == WALL_SIGN)
{ {
@@ -58,12 +65,7 @@ public class SignBlockListener implements Listener
} }
} }
} }
// prevent any signs be broken by destroying the block they are attached to
if (EssentialsSign.checkIfBlockBreaksSigns(block))
{
LOGGER.log(Level.INFO, "Prevented that a block was broken next to a sign.");
return true;
}
for (EssentialsSign sign : ess.getSettings().enabledSigns()) for (EssentialsSign sign : ess.getSettings().enabledSigns())
{ {
if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType()) if (sign.areHeavyEventRequired() && sign.getBlocks().contains(block.getType())