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

Merge pull request #2489 from isokissa3/master

Browse Source 
Fixed duplication Bug #2489 
Tentatively pulling this as I assume its valid.
This commit is contained in:
t00thpick1 2015-03-18 03:51:35 -04:00
commit 7ce72bafb0
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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;
@ -98,14 +99,23 @@ public class BlockListener implements Listener {
return; return;
} }
if (!event.isSticky()) { // 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; return;
} }
Block movedBlock = event.getRetractLocation().getBlock(); // 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);
} }
} }