diff options
Diffstat (limited to 'nms-patches/BlockCommand.patch')
| -rw-r--r-- | nms-patches/BlockCommand.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nms-patches/BlockCommand.patch b/nms-patches/BlockCommand.patch index 94c248a6..08c95440 100644 --- a/nms-patches/BlockCommand.patch +++ b/nms-patches/BlockCommand.patch @@ -1,21 +1,20 @@ --- a/net/minecraft/server/BlockCommand.java +++ b/net/minecraft/server/BlockCommand.java -@@ -2,6 +2,8 @@ - +@@ -3,6 +3,8 @@ import java.util.Random; + import javax.annotation.Nullable; +import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit + public class BlockCommand extends BlockTileEntity { public static final BlockStateDirection a = BlockDirectional.FACING; -@@ -29,7 +31,17 @@ - boolean flag1 = tileentitycommand.d(); - boolean flag2 = tileentitycommand.e(); +@@ -30,7 +32,16 @@ + boolean flag1 = tileentitycommand.e(); + boolean flag2 = tileentitycommand.g(); - if (flag && !flag1) { + // CraftBukkit start -+ // PAIL: This section - renames, ordering + org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); + int old = flag1 ? 15 : 0; + int current = flag ? 15 : 0; @@ -26,9 +25,9 @@ + + if (eventRedstone.getNewCurrent() > 0 && !(eventRedstone.getOldCurrent() > 0)) { // CraftBukkit tileentitycommand.a(true); - if (tileentitycommand.i() != TileEntityCommand.Type.SEQUENCE && !flag2) { - boolean flag3 = !tileentitycommand.j() || this.e(world, blockposition, iblockdata); -@@ -40,7 +52,7 @@ + if (tileentitycommand.j() != TileEntityCommand.Type.SEQUENCE && !flag2) { + boolean flag3 = !tileentitycommand.k() || this.e(world, blockposition, iblockdata); +@@ -41,7 +52,7 @@ this.c(world, blockposition); } } |