Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-02-18 13:21:46 +01:00
Code Issues Projects Releases Wiki Activity

Regions now protect against pistons with slime blocks.

Browse Source 
Fixes WORLDGUARD-3493.
This commit is contained in:
wizjany 2015-08-02 17:00:06 -04:00
parent 0ddc011a3c
commit 96e0ffd293
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View File

@ -251,15 +251,19 @@ public void onBlockPistonRetract(BlockPistonRetractEvent event) {
Block piston = event.getBlock(); Block piston = event.getBlock();
Cause cause = create(piston); Cause cause = create(piston);
// Workaround for incorrect piston events
BlockFace direction = event.getDirection(); BlockFace direction = event.getDirection();
if (piston.getType() == Material.PISTON_MOVING_PIECE) {
direction = new PistonExtensionMaterial(Material.PISTON_STICKY_BASE.getId(), piston.getData()).getFacing();
}
Location retractLocation = piston.getRelative(direction, 2).getLocation();
Events.fireToCancel(event, new BreakBlockEvent(event, cause, retractLocation, Material.AIR)); ArrayList<Block> blocks = new ArrayList<Block>(event.getBlocks());
Events.fireToCancel(event, new PlaceBlockEvent(event, cause, piston.getRelative(direction))); int originalSize = blocks.size();
Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, cause, event.getBlock().getWorld(), blocks, Material.AIR));
if (originalSize != blocks.size()) {
event.setCancelled(true);
}
for (Block b : event.getBlocks()) {
Location loc = b.getRelative(direction).getLocation();
Events.fireToCancel(event, new PlaceBlockEvent(event, cause, loc, b.getType()));
}
entry.setCancelled(event.isCancelled()); entry.setCancelled(event.isCancelled());
if (event.isCancelled()) { if (event.isCancelled()) {
@ -273,11 +277,12 @@ public void onBlockPistonRetract(BlockPistonRetractEvent event) {
public void onBlockPistonExtend(BlockPistonExtendEvent event) { public void onBlockPistonExtend(BlockPistonExtendEvent event) {
EventDebounce.Entry entry = pistonExtendDebounce.getIfNotPresent(new BlockPistonExtendKey(event), event); EventDebounce.Entry entry = pistonExtendDebounce.getIfNotPresent(new BlockPistonExtendKey(event), event);
if (entry != null) { if (entry != null) {
// A hack for now
List<Block> blocks = new ArrayList<Block>(event.getBlocks()); List<Block> blocks = new ArrayList<Block>(event.getBlocks());
Block lastBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1);
blocks.add(lastBlock);
int originalLength = blocks.size(); int originalLength = blocks.size();
BlockFace dir = event.getDirection();
for (int i = 0; i < blocks.size(); i++) {
blocks.set(i, blocks.get(i).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) {
event.setCancelled(true); event.setCancelled(true);