From 6ec4668177f6c771c170695714ed12b0ea5b5eb7 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Thu, 9 Apr 2015 23:12:35 +1000 Subject: [PATCH] Fixed piston --- .../plot/listeners/PlayerEvents.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java index 0dba51427..fde99b687 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -18,6 +18,7 @@ import org.bukkit.entity.Animals; import org.bukkit.entity.Arrow; import org.bukkit.entity.Creature; import org.bukkit.entity.Entity; +import org.bukkit.entity.FallingBlock; import org.bukkit.entity.Fireball; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.LargeFireball; @@ -662,7 +663,8 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi if (plot != null) { BlockFace face = event.getDirection(); Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ()); - for (final Block b : event.getBlocks()) { + List blocks = event.getBlocks(); + for (final Block b : blocks) { Location bloc = BukkitUtil.getLocation(b.getLocation().add(relative)); Plot newPlot = MainUtil.getPlot(bloc); if (!plot.equals(newPlot)) { @@ -670,6 +672,23 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi return; } } + org.bukkit.Location lastLoc; + if (blocks.size() > 0) { + lastLoc = blocks.get(blocks.size() - 1).getLocation().add(relative); + } + else { + lastLoc = event.getBlock().getLocation().add(relative); + } + Entity[] ents = lastLoc.getChunk().getEntities(); + for (Entity entity : ents) { + if (entity instanceof FallingBlock) { + org.bukkit.Location eloc = entity.getLocation(); + if (eloc.distanceSquared(lastLoc) < 2) { + event.setCancelled(true); + return; + } + } + } } }