Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-09 08:51:59 +01:00
Code Issues Projects Releases Wiki Activity

Don't check spaces that won't get moved into by pistons.

Browse Source 
Fixes WORLDGUARD-4064.
This commit is contained in:
wizjany 2019-03-20 21:49:45 -04:00
parent b2fe4c9c71
commit d091cb578f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -61,6 +61,7 @@
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest; import org.bukkit.block.DoubleChest;
import org.bukkit.block.Hopper; import org.bukkit.block.Hopper;
import org.bukkit.block.PistonMoveReaction;
import org.bukkit.entity.AreaEffectCloud; import org.bukkit.entity.AreaEffectCloud;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -363,7 +364,11 @@ public void onBlockPistonExtend(BlockPistonExtendEvent event) {
int originalLength = blocks.size(); int originalLength = blocks.size();
BlockFace dir = event.getDirection(); BlockFace dir = event.getDirection();
for (int i = 0; i < blocks.size(); i++) { for (int i = 0; i < blocks.size(); i++) {
blocks.set(i, blocks.get(i).getRelative(dir)); Block existing = blocks.get(i);
if (existing.getPistonMoveReaction() == PistonMoveReaction.MOVE
|| existing.getPistonMoveReaction() == PistonMoveReaction.PUSH_ONLY) {
blocks.set(i, existing.getRelative(dir));
}
} }
Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, create(event.getBlock()), event.getBlock().getWorld(), blocks, Material.STONE)); Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, create(event.getBlock()), event.getBlock().getWorld(), blocks, Material.STONE));
if (blocks.size() != originalLength) { if (blocks.size() != originalLength) {