Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-29 12:07:54 +01:00
Code Issues Projects Releases Wiki Activity

Fixed duplication bug #2419 (Correct fix)

Browse Source
This commit is contained in:
isokissa3 2015-03-11 14:31:56 +02:00
parent 6c29da94f3
commit f76771f0a8
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.gmail.nossr50.listeners;
import java.util.List; import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -94,18 +95,27 @@ public class BlockListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockPistonRetract(BlockPistonRetractEvent event) { public void onBlockPistonRetract(BlockPistonRetractEvent event) {
/*if (!EventUtils.shouldProcessEvent(event.getBlock(), false)) { if (!EventUtils.shouldProcessEvent(event.getBlock(), false)) {
return;
}*/
if (!event.isSticky()) {
return; return;
} }
Block movedBlock = event.getRetractLocation().getBlock(); // Don't even work, return ALLWAYS false xD
/*if (!event.isSticky()){
return;
}*/
// Sticky piston return PISTON_MOVING_PIECE and normal piston PISTON_BASE, so mess stuff
if (event.getBlock().getType() != Material.PISTON_MOVING_PIECE) {
return;
}
// event.getRetractLocation() return wrong side and too far away
// Get opposite direction so we get correct block, so mess stuff
Block movedBlock = event.getBlock().getRelative(event.getDirection().getOppositeFace());
// 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.getDirection(), event.getBlock(), movedBlock).runTaskLater(plugin, 2); // Opposite side here too
new StickyPistonTrackerTask(event.getDirection().getOppositeFace(), event.getBlock(), movedBlock).runTaskLater(plugin, 2);
} }
/** /**

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

@ -1,5 +1,6 @@
package com.gmail.nossr50.runnables; package com.gmail.nossr50.runnables;
import org.bukkit.Bukkit;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -20,7 +21,7 @@ public class StickyPistonTrackerTask extends BukkitRunnable {
@Override @Override
public void run() { public void run() {
if (!mcMMO.getPlaceStore().isTrue(movedBlock)) { if (!mcMMO.getPlaceStore().isTrue(movedBlock.getRelative(direction))) {
return; return;
} }
@ -30,7 +31,7 @@ public class StickyPistonTrackerTask extends BukkitRunnable {
} }
// The sticky piston actually pulled the block so move the PlaceStore data // The sticky piston actually pulled the block so move the PlaceStore data
mcMMO.getPlaceStore().setFalse(movedBlock); mcMMO.getPlaceStore().setFalse(movedBlock.getRelative(direction));
mcMMO.getPlaceStore().setTrue(movedBlock.getRelative(direction)); mcMMO.getPlaceStore().setTrue(movedBlock);
} }
} }