Update old TNT cannon mechanics patch to 1.9.4

Behavior may be buggy or otherwise broken, testing with the option is needed.
`fix-cannons` has been removed in favor of `enable-old-tnt-cannon-behaviors`

1 files changed, 395 insertions, 0 deletions

diff --git a/Spigot-Server-Patches/0159-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0159-Optional-old-TNT-cannon-behaviors.patch
new file mode 100644
index 0000000000..8bad61dbaf
--- /dev/null
+++ b/Spigot-Server-Patches/0159-Optional-old-TNT-cannon-behaviors.patch
@@ -0,0 +1,395 @@
+From 9b002ecab7ef680b6a1fb31a26978850620bd457 Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+Date: Sun, 22 May 2016 20:20:55 -0500
+Subject: [PATCH] Optional old TNT cannon behaviors
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 9c79f2e..3b0542a 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -366,4 +366,12 @@ public class PaperWorldConfig {
+             );
+         }
+     }
++
++    public boolean oldCannonBehaviors;
++    private void oldCannonBehaviors() {
++        oldCannonBehaviors = getBoolean("enable-old-tnt-cannon-behaviors", false);
++        if (oldCannonBehaviors) {
++            log("Old Cannon Behaviors: This feature may not be working entirely properly at the moment");
++        }
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
+index f422843..8abe359 100644
+--- a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
++++ b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java
+@@ -76,6 +76,17 @@ public abstract class BlockDiodeAbstract extends BlockFacingHorizontal {
+         } else {
+             this.b(world, blockposition, iblockdata, 0);
+             world.setAir(blockposition);
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                world.applyPhysics(blockposition.shift(EnumDirection.EAST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.WEST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.SOUTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.NORTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.DOWN), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.UP), this);
++                return;
++            }
++            // Paper end
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i = aenumdirection.length;
+ 
+@@ -173,6 +184,17 @@ public abstract class BlockDiodeAbstract extends BlockFacingHorizontal {
+ 
+     public void postBreak(World world, BlockPosition blockposition, IBlockData iblockdata) {
+         if (this.d) {
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                world.applyPhysics(blockposition.shift(EnumDirection.EAST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.WEST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.NORTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.SOUTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.DOWN), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.UP), this);
++                return;
++            }
++            // Paper end
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i = aenumdirection.length;
+ 
+diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
+index 712b0c0..e2f4f44 100644
+--- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
++++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
+@@ -53,6 +53,12 @@ public class BlockRedstoneTorch extends BlockTorch {
+ 
+     public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
+         if (this.isOn) {
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                this.shiftPositions(world, blockposition);
++                return;
++            }
++            // Paper end
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i = aenumdirection.length;
+ 
+@@ -67,6 +73,12 @@ public class BlockRedstoneTorch extends BlockTorch {
+ 
+     public void remove(World world, BlockPosition blockposition, IBlockData iblockdata) {
+         if (this.isOn) {
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                this.shiftPositions(world, blockposition);
++                return;
++            }
++            // Paper end
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i = aenumdirection.length;
+ 
+@@ -79,6 +91,17 @@ public class BlockRedstoneTorch extends BlockTorch {
+ 
+     }
+ 
++    // Paper start - Old TNT cannon behaviors
++    private void shiftPositions(World world, BlockPosition blockposition) {
++        world.applyPhysics(blockposition.shift(EnumDirection.DOWN), this);
++        world.applyPhysics(blockposition.shift(EnumDirection.UP), this);
++        world.applyPhysics(blockposition.shift(EnumDirection.WEST), this);
++        world.applyPhysics(blockposition.shift(EnumDirection.EAST), this);
++        world.applyPhysics(blockposition.shift(EnumDirection.SOUTH), this);
++        world.applyPhysics(blockposition.shift(EnumDirection.NORTH), this);
++    }
++    // Paper end
++
+     public int b(IBlockData iblockdata, IBlockAccess iblockaccess, BlockPosition blockposition, EnumDirection enumdirection) {
+         return this.isOn && iblockdata.get(BlockRedstoneTorch.FACING) != enumdirection ? 15 : 0;
+     }
+diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+index 93671ed..661c4f9 100644
+--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
++++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+@@ -20,7 +20,7 @@ public class BlockRedstoneWire extends Block {
+     public static final BlockStateInteger POWER = BlockStateInteger.of("power", 0, 15);
+     protected static final AxisAlignedBB[] f = new AxisAlignedBB[] { new AxisAlignedBB(0.1875D, 0.0D, 0.1875D, 0.8125D, 0.0625D, 0.8125D), new AxisAlignedBB(0.1875D, 0.0D, 0.1875D, 0.8125D, 0.0625D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.1875D, 0.8125D, 0.0625D, 0.8125D), new AxisAlignedBB(0.0D, 0.0D, 0.1875D, 0.8125D, 0.0625D, 1.0D), new AxisAlignedBB(0.1875D, 0.0D, 0.0D, 0.8125D, 0.0625D, 0.8125D), new AxisAlignedBB(0.1875D, 0.0D, 0.0D, 0.8125D, 0.0625D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.8125D, 0.0625D, 0.8125D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.8125D, 0.0625D, 1.0D), new AxisAlignedBB(0.1875D, 0.0D, 0.1875D, 1.0D, 0.0625D, 0.8125D), new AxisAlignedBB(0.1875D, 0.0D, 0.1875D, 1.0D, 0.0625D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.1875D, 1.0D, 0.0625D, 0.8125D), new AxisAlignedBB(0.0D, 0.0D, 0.1875D, 1.0D, 0.0625D, 1.0D), new AxisAlignedBB(0.1875D, 0.0D, 0.0D, 1.0D, 0.0625D, 0.8125D), new AxisAlignedBB(0.1875D, 0.0D, 0.0D, 1.0D, 0.0625D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.0625D, 0.8125D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.0625D, 1.0D)};
+     private boolean g = true;
+-    private final Set<BlockPosition> B = Sets.newHashSet();
++    private final Set<BlockPosition> B = Sets.newHashSet(); private final Set<BlockPosition> blocksToUpdate = B; // Paper - OBFHELPER
+ 
+     public BlockRedstoneWire() {
+         super(Material.ORIENTABLE);
+@@ -186,6 +186,19 @@ public class BlockRedstoneWire extends Block {
+             }
+ 
+             this.B.add(blockposition);
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.WEST));
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.EAST));
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.DOWN));
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.UP));
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.NORTH));
++                this.blocksToUpdate.add(blockposition.shift(EnumDirection.SOUTH));
++                return iblockdata;
++            }
++            // Paper end
++
++
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i1 = aenumdirection.length;
+ 
+@@ -202,6 +215,17 @@ public class BlockRedstoneWire extends Block {
+     private void b(World world, BlockPosition blockposition) {
+         if (world.getType(blockposition).getBlock() == this) {
+             world.applyPhysics(blockposition, this);
++            // Paper start - Old TNT cannon behaviors
++            if (world.paperConfig.oldCannonBehaviors) {
++                world.applyPhysics(blockposition.shift(EnumDirection.WEST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.EAST), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.NORTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.SOUTH), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.DOWN), this);
++                world.applyPhysics(blockposition.shift(EnumDirection.UP), this);
++                return;
++            }
++            // Paper end
+             EnumDirection[] aenumdirection = EnumDirection.values();
+             int i = aenumdirection.length;
+ 
+diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
+index c5022e2..805766d 100644
+--- a/src/main/java/net/minecraft/server/BlockTNT.java
++++ b/src/main/java/net/minecraft/server/BlockTNT.java
+@@ -31,7 +31,11 @@ public class BlockTNT extends Block {
+ 
+     public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
+         if (!world.isClientSide) {
+-            EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F), explosion.getSource());
++            // Paper start - Old TNT cannon behaviors
++            double y = blockposition.getY();
++            if (!world.paperConfig.oldCannonBehaviors) y += 0.5;
++            EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), y, (double) ((float) blockposition.getZ() + 0.5F), explosion.getSource());
++            // Paper end
+ 
+             entitytntprimed.setFuseTicks((short) (world.random.nextInt(entitytntprimed.getFuseTicks() / 4) + entitytntprimed.getFuseTicks() / 8));
+             world.addEntity(entitytntprimed);
+@@ -45,7 +49,11 @@ public class BlockTNT extends Block {
+     public void a(World world, BlockPosition blockposition, IBlockData iblockdata, EntityLiving entityliving) {
+         if (!world.isClientSide) {
+             if (((Boolean) iblockdata.get(BlockTNT.EXPLODE)).booleanValue()) {
+-                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F), entityliving);
++                // Paper start - Old TNT cannon behaviors
++                double y = blockposition.getY();
++                if (!world.paperConfig.oldCannonBehaviors) y += 0.5;
++                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), y, (double) ((float) blockposition.getZ() + 0.5F), entityliving);
++                // Paper end
+ 
+                 world.addEntity(entitytntprimed);
+                 world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gk, SoundCategory.BLOCKS, 1.0F, 1.0F);
+diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
+index 4e31ab1..bb58134 100644
+--- a/src/main/java/net/minecraft/server/DispenserRegistry.java
++++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
+@@ -497,7 +497,11 @@ public class DispenserRegistry {
+                 org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
+                 CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
+ 
+-                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D));
++                // Paper start - Old TNT cannon behaviors
++                double y = blockposition.getY();
++                if (!world.paperConfig.oldCannonBehaviors) y += 0.5;
++                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) blockposition.getX() + 0.5D, y, (double) blockposition.getZ() + 0.5D));
++                // Paper end
+                 if (!BlockDispenser.eventFired) {
+                    world.getServer().getPluginManager().callEvent(event);
+                 }
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 02a1c25..d54a30b 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -960,6 +960,12 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     public boolean aj() {
++        // Paper start - OBFHELPER
++        return this.doWaterMovement();
++    }
++
++    public boolean doWaterMovement() {
++        // Paper end
+         if (this.bz() instanceof EntityBoat) {
+             this.inWater = false;
+         } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) {
+@@ -1150,6 +1156,12 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     public double f(double d0, double d1, double d2) {
++        // Paper start - OBFHELPER
++        return this.getDistance(d0, d1, d2);
++    }
++
++    public double getDistance(double d0, double d1, double d2) {
++        // Paper end
+         double d3 = this.locX - d0;
+         double d4 = this.locY - d1;
+         double d5 = this.locZ - d2;
+@@ -1204,6 +1216,12 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     public void g(double d0, double d1, double d2) {
++        // Paper start - OBFHELPER
++        this.addVelocity(d0, d1, d2);
++    }
++
++    public void addVelocity(double d0, double d1, double d2) {
++        // Paper end
+         this.motX += d0;
+         this.motY += d1;
+         this.motZ += d2;
+@@ -2311,6 +2329,12 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     public boolean be() {
++        // Paper start - OBFHELPER
++        return this.pushedByWater();
++    }
++
++    public boolean pushedByWater() {
++        // Paper end
+         return true;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
+index 4c14d75..a5d8f02 100644
+--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
++++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
+@@ -274,4 +274,19 @@ public class EntityFallingBlock extends Entity {
+     public boolean bs() {
+         return true;
+     }
++
++    // Paper start - Old TNT cannon behaviors
++    @Override
++    public double getDistance(double d0, double d1, double d2) {
++        if (!world.paperConfig.oldCannonBehaviors) return super.getDistance(d0, d1, d2);
++
++        double newX = this.locX - d0;
++        double newY = this.locY + this.getHeadHeight() - d1;
++        double newZ = this.locZ - d2;
++
++        return (double) MathHelper.sqrt(newX * newX + newY * newY + newZ * newZ);
++    }
++
++
++    // Paper end
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+index 1113b1c..436bbb8 100644
+--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
++++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+@@ -30,6 +30,7 @@ public class EntityTNTPrimed extends Entity {
+         this.lastY = d1;
+         this.lastZ = d2;
+         this.source = entityliving;
++        if (world.paperConfig.oldCannonBehaviors) this.motX = this.motZ = 0.0F; // Paper - Old TNT cannon behaviors
+     }
+ 
+     protected void i() {
+@@ -119,7 +120,7 @@ public class EntityTNTPrimed extends Entity {
+     }
+ 
+     public float getHeadHeight() {
+-        return 0.0F;
++        return world.paperConfig.oldCannonBehaviors ? this.length / 2 : 0.0F; // Paper - Old TNT cannon behaviors
+     }
+ 
+     public void setFuseTicks(int i) {
+@@ -141,4 +142,58 @@ public class EntityTNTPrimed extends Entity {
+     public int getFuseTicks() {
+         return this.c;
+     }
++
++    // Paper start - Old TNT cannon behaviors
++    @Override
++    public double getDistance(double d0, double d1, double d2) {
++        if (!world.paperConfig.oldCannonBehaviors) return super.getDistance(d0, d1, d2);
++
++        double newX = this.locX - d0;
++        double newY = this.locY + this.getHeadHeight() - d1;
++        double newZ = this.locZ - d2;
++
++        return (double) MathHelper.sqrt(newX * newX + newY * newY + newZ * newZ);
++    }
++
++    @Override
++    public boolean pushedByWater() {
++        return !world.paperConfig.oldCannonBehaviors && super.pushedByWater();
++    }
++
++    /**
++     * Author: Jedediah Smith <[email protected]>
++     */
++    @Override
++    public boolean doWaterMovement() {
++        if (!world.paperConfig.oldCannonBehaviors) return super.doWaterMovement();
++
++        // Preserve velocity while calling the super method
++        double oldMotX = this.motX;
++        double oldMotY = this.motY;
++        double oldMotZ = this.motZ;
++
++        super.doWaterMovement();
++
++        this.motX = oldMotX;
++        this.motY = oldMotY;
++        this.motZ = oldMotZ;
++
++        if (this.inWater) {
++            // Send position and velocity updates to nearby players on every tick while the TNT is in water.
++            // This does pretty well at keeping their clients in sync with the server.
++            EntityTrackerEntry ete = ((WorldServer) this.getWorld()).getTracker().trackedEntities.get(this.getId());
++            if (ete != null) {
++                PacketPlayOutEntityVelocity velocityPacket = new PacketPlayOutEntityVelocity(this);
++                PacketPlayOutEntityTeleport positionPacket = new PacketPlayOutEntityTeleport(this);
++
++                ete.trackedPlayers.stream().filter(viewer -> (viewer.locX - this.locX) * (viewer.locY - this.locY) * (viewer.locZ - this.locZ) < 16 * 16).forEach(viewer -> {
++                    viewer.playerConnection.sendPacket(velocityPacket);
++                    viewer.playerConnection.sendPacket(positionPacket);
++                });
++            }
++        }
++
++        return this.inWater;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
+index 28261c5..275e044 100644
+--- a/src/main/java/net/minecraft/server/Explosion.java
++++ b/src/main/java/net/minecraft/server/Explosion.java
+@@ -148,9 +148,15 @@ public class Explosion {
+                             d14 = entity instanceof EntityHuman && world.paperConfig.disableExplosionKnockback ? 0 : EnchantmentProtection.a((EntityLiving) entity, d13); // Paper - Disable explosion knockback
+                         }
+ 
+-                        entity.motX += d8 * d14;
+-                        entity.motY += d9 * d14;
+-                        entity.motZ += d10 * d14;
++                        // Paper start - Fix cannons
++                        /*
++                         entity.motX += d8 * d14;
++                         entity.motY += d9 * d14;
++                         entity.motZ += d10 * d14;
++                          */
++                        // This impulse method sets the dirty flag, so clients will get an immediate velocity update
++                        entity.addVelocity(d8 * d14, d9 * d14, d10 * d14);
++                        // Paper end
+                         if (entity instanceof EntityHuman) {
+                             EntityHuman entityhuman = (EntityHuman) entity;
+ 
+-- 
+2.8.2
+