|
@@ -75,12 +75,14 @@ public class BlockListener implements Listener {
|
|
|
|
|
|
for (Block b : blocks) {
|
|
|
if (BlockUtils.shouldBeWatched(b.getState()) && mcMMO.getPlaceStore().isTrue(b)) {
|
|
|
- b.getRelative(direction).setMetadata(mcMMO.blockMetadataKey, mcMMO.metadataValue);
|
|
|
+ Block nextBlock = b.getRelative(direction);
|
|
|
+ mcMMO.getPlaceStore().setTrue(nextBlock);
|
|
|
+ //b.getRelative(direction).setMetadata(mcMMO.blockMetadataKey, mcMMO.metadataValue);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// Needed because blocks sometimes don't move when two pistons push towards each other
|
|
|
- new PistonTrackerTask(blocks, direction, futureEmptyBlock).runTaskLater(plugin, 2);
|
|
|
+ //new PistonTrackerTask(blocks, direction, futureEmptyBlock).runTaskLater(plugin, 2);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -103,20 +105,23 @@ public class BlockListener implements Listener {
|
|
|
// Get opposite direction so we get correct block
|
|
|
BlockFace direction = event.getDirection().getOppositeFace();
|
|
|
Block movedBlock = event.getBlock().getRelative(direction);
|
|
|
+ mcMMO.getPlaceStore().setTrue(movedBlock);
|
|
|
|
|
|
// If we're pulling a slime block, it might have something attached to it!
|
|
|
if (movedBlock.getRelative(direction).getState().getType() == Material.SLIME_BLOCK) {
|
|
|
for (Block block : event.getBlocks()) {
|
|
|
+ movedBlock = block.getRelative(direction);
|
|
|
+ mcMMO.getPlaceStore().setTrue(movedBlock);
|
|
|
// // Treat the slime blocks as if it is the sticky piston itself, because pulling
|
|
|
// // a slime block with a sticky piston is effectively the same as moving a sticky piston.
|
|
|
- new StickyPistonTrackerTask(direction, event.getBlock(), block).runTaskLater(plugin, 2);
|
|
|
+ // new StickyPistonTrackerTask(direction, event.getBlock(), block).runTaskLater(plugin, 2);
|
|
|
}
|
|
|
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
// Needed only because under some circumstances Minecraft doesn't move the block
|
|
|
- new StickyPistonTrackerTask(direction, event.getBlock(), movedBlock).runTaskLater(plugin, 2);
|
|
|
+ //new StickyPistonTrackerTask(direction, event.getBlock(), movedBlock).runTaskLater(plugin, 2);
|
|
|
}
|
|
|
|
|
|
/**
|