2014-11-29 00:02:15 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockCommand.java 2014-11-28 17:43:42.885707440 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockCommand.java 2014-11-28 17:38:18.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -2,6 +2,8 @@
|
|
|
|
|
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class BlockCommand extends BlockContainer {
|
|
|
|
|
|
|
|
|
|
public static final BlockStateBoolean TRIGGERED = BlockStateBoolean.of("triggered");
|
|
|
|
|
@@ -19,11 +21,20 @@
|
|
|
|
|
if (!world.isStatic) {
|
|
|
|
|
boolean flag = world.isBlockIndirectlyPowered(blockposition);
|
|
|
|
|
boolean flag1 = ((Boolean) iblockdata.get(BlockCommand.TRIGGERED)).booleanValue();
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ int old = flag1 ? 15 : 0;
|
|
|
|
|
+ int current = flag ? 15 : 0;
|
|
|
|
|
+
|
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, old, current);
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
- if (flag && !flag1) {
|
|
|
|
|
+ if (eventRedstone.getNewCurrent() > 0 && !(eventRedstone.getOldCurrent() > 0)) { // CraftBukkit
|
|
|
|
|
world.setTypeAndData(blockposition, iblockdata.set(BlockCommand.TRIGGERED, Boolean.valueOf(true)), 4);
|
|
|
|
|
world.a(blockposition, (Block) this, this.a(world));
|
|
|
|
|
- } else if (!flag && flag1) {
|
|
|
|
|
+ } else if (!(eventRedstone.getNewCurrent() > 0) && eventRedstone.getOldCurrent() > 0) { // CraftBukkit
|
|
|
|
|
world.setTypeAndData(blockposition, iblockdata.set(BlockCommand.TRIGGERED, Boolean.valueOf(false)), 4);
|
|
|
|
|
}
|
|
|
|
|
}
|
