SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for pistons being able to push blocks into protected territory through water or lava

Browse Source
This commit is contained in:
Brettflan 2012-11-11 13:05:59 -06:00
parent 8aa9e18be6
commit 1e9cf01e23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -82,8 +82,8 @@ public class FactionsBlockListener implements Listener
// target end-of-the-line empty (air) block which is being pushed into, including if piston itself would extend into air // target end-of-the-line empty (air) block which is being pushed into, including if piston itself would extend into air
Block targetBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1); Block targetBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1);
// if potentially pushing into air in another territory, we need to check it out // if potentially pushing into air/water/lava in another territory, we need to check it out
if (targetBlock.isEmpty() && !canPistonMoveBlock(pistonFaction, targetBlock.getLocation())) if ((targetBlock.isEmpty() || targetBlock.isLiquid()) && !canPistonMoveBlock(pistonFaction, targetBlock.getLocation()))
{ {
event.setCancelled(true); event.setCancelled(true);
return; return;
@ -107,8 +107,8 @@ public class FactionsBlockListener implements Listener
Location targetLoc = event.getRetractLocation(); Location targetLoc = event.getRetractLocation();
// if potentially retracted block is just air, no worries // if potentially retracted block is just air/water/lava, no worries
if (targetLoc.getBlock().isEmpty()) if (targetLoc.getBlock().isEmpty() || targetLoc.getBlock().isLiquid())
{ {
return; return;
} }