EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Passing events is bad.

Browse Source
This commit is contained in:
GJ 2013-03-28 09:30:49 -04:00
parent 0b6dfad7e5
commit fe89c19969
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@ -58,7 +58,6 @@ public class BlockListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onBlockPistonExtend(BlockPistonExtendEvent event) { public void onBlockPistonExtend(BlockPistonExtendEvent event) {
List<Block> blocks = event.getBlocks(); List<Block> blocks = event.getBlocks();
BlockFace direction = event.getDirection(); BlockFace direction = event.getDirection();
Block futureEmptyBlock = event.getBlock().getRelative(direction); // Block that would be air after piston is finished Block futureEmptyBlock = event.getBlock().getRelative(direction); // Block that would be air after piston is finished
@ -89,7 +88,7 @@ public class BlockListener implements Listener {
public void onBlockPistonRetract(BlockPistonRetractEvent event) { public void onBlockPistonRetract(BlockPistonRetractEvent event) {
if (event.isSticky()) { if (event.isSticky()) {
// Needed only because under some circumstances Minecraft doesn't move the block // Needed only because under some circumstances Minecraft doesn't move the block
new StickyPistonTrackerTask(event).runTaskLater(plugin, 2); new StickyPistonTrackerTask(event.getDirection(), event.getBlock()).runTaskLater(plugin, 2);
} }
} }

20
src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java
View File

@ -2,28 +2,26 @@ package com.gmail.nossr50.runnables;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.block.BlockFace;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
public class StickyPistonTrackerTask extends BukkitRunnable { public class StickyPistonTrackerTask extends BukkitRunnable {
BlockPistonRetractEvent event; private BlockFace direction;
private Block block;
public StickyPistonTrackerTask(BlockPistonRetractEvent event) { public StickyPistonTrackerTask(BlockFace direction, Block block) {
this.event = event; this.direction = direction;
this.block = block;
} }
@Override @Override
public void run() { public void run() {
Block newBlock = event.getBlock().getRelative(event.getDirection()); Block newBlock = block.getRelative(direction);
Block originalBlock = newBlock.getRelative(event.getDirection()); Block originalBlock = newBlock.getRelative(direction);
if (originalBlock.getType() != Material.AIR) { if (originalBlock.getType() != Material.AIR || !mcMMO.placeStore.isTrue(originalBlock)) {
return;
}
if (!mcMMO.placeStore.isTrue(originalBlock)) {
return; return;
} }