Clean up merge cannon entities respawn logic

patches/server/0019-Merge-Cannon-Entities.patch

@@ -189,10 +189,10 @@ index f48eaebb0f9a10fb77e85619b2d2a4996e461195..a507605a04af7f576548129517029192
                              this.guardEntityTick(this::tickNonPassenger, entity);
                              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e2769ec08 100644
+index 89af45a998dd1884bac8ace525b87be9dd291789..6e2defee2a8523d7025a8341b41488192618dd1a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -579,6 +579,105 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -579,6 +579,107 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return BlockPos.asLong(v.getBlockX(), v.getBlockY(), v.getBlockZ());
      }
      // Sakura end
@@ -272,7 +272,9 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e
 +        return false;
 +    }
 +
-+    protected void respawn() {}
++    protected boolean respawnMerged() {
++        return false;
++    }
 +
 +    protected boolean isSafeToMergeInto(Entity entity) {
 +        return false;
@@ -298,15 +300,15 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e
 
      public boolean isLegacyTrackingEntity = false;
 
-@@ -657,6 +756,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -657,6 +758,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.getEntityData().registrationLocked = true; // Spigot
          this.setPos(0.0D, 0.0D, 0.0D);
          this.eyeHeight = this.getEyeHeight(net.minecraft.world.entity.Pose.STANDING, this.dimensions);
 +        this.mergeLevel = level.sakuraConfig().cannons.mergeLevel; // Sakura
      }
 
      public boolean isColliding(BlockPos pos, BlockState state) {
-@@ -2522,6 +2622,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2522,6 +2624,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  nbttagcompound.putBoolean("Paper.FreezeLock", true);
              }
              // Paper end
@@ -318,7 +320,7 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -2669,6 +2774,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2669,6 +2776,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  freezeLocked = nbt.getBoolean("Paper.FreezeLock");
              }
              // Paper end
@@ -330,7 +332,7 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e
 
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4876,6 +4986,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4876,6 +4988,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              return;
          }
          // Paper end - rewrite chunk system
@@ -343,7 +345,7 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..c9d94d157b4bc52742050d75b3a11b8e
          if (this.removalReason == null) {
              this.removalReason = reason;
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 0cf39ea76902e62b712057fe1bb80e3af8190fc4..6662d48f691cf6ab515a3eb64642dcb770d1caa0 100644
+index 0cf39ea76902e62b712057fe1bb80e3af8190fc4..3a0d82cd7a0d7ec20138effd6d84eee60ffab788 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -132,6 +132,58 @@ public class FallingBlockEntity extends Entity {
@@ -364,60 +366,60 @@ index 0cf39ea76902e62b712057fe1bb80e3af8190fc4..6662d48f691cf6ab515a3eb64642dcb7
 +    }
 +
 +    @Override
-+    protected void respawn() {
-+        while (stacked-- > 1) {
-+            // create a temporary falling block entity
-+            var fallingBlock = new FallingBlockEntity(EntityType.FALLING_BLOCK, level());
++    protected boolean respawnMerged() {
++        if (stacked <= 1) return false;
 +
-+            // use our the previous state
-+            entityState().apply(fallingBlock);
-+            fallingBlock.time = time - 1;
++        while (stacked-- >= 1) {
++            // Unlike PrimedTnt we have to try respawn each stacked entity
++            FallingBlockEntity fallingBlock = new FallingBlockEntity(EntityType.FALLING_BLOCK, level());
 +
-+            // and tick
++            // Try to stack the falling block
++            this.entityState().apply(fallingBlock);
++            fallingBlock.time = time - 1;
 +            fallingBlock.tick();
 +
-+            // Well, this can actually happen.
-+            // If you horizontal or rectangle stack sand into a b36 this condition will be met.
-+            // This could break some suspicious render queuing setups relying on horizontal stacking
-+            // and keeping sand in b36 using pistons pushing back and forth.
++            // If you horizontal stack into a moving piston block this condition will be met.
 +            if (!fallingBlock.isRemoved()) {
-+                fallingBlock.stacked = stacked;
-+                level().addFreshEntity(fallingBlock);
++                stacked++;
++                fallingBlock.storeEntityState();
++                fallingBlock.entityState().apply(this);
 +                break;
++            } else if (stacked == 0) {
++                this.discard();
 +            }
 +        }
++
++        return true;
 +    }
 +
 +    @Nullable
 +    public ItemEntity spawnAtLocation(ItemLike item) {
-+        // This is to prevent sand continuing to respawn incase it broke.
 +        ItemEntity itemEntity = null;
 +
-+        for (int i = 0; i < stacked; ++i) {
++        while (stacked-- >= 1) {
 +            itemEntity = super.spawnAtLocation(item);
 +        }
 +
-+        stacked = 1;
 +        return itemEntity;
 +    }
 +    // Sakura end
 +
      @Override
      public void tick() {
          // Paper start - fix sand duping
-@@ -214,6 +266,7 @@ public class FallingBlockEntity extends Entity {
+@@ -211,6 +263,7 @@ public class FallingBlockEntity extends Entity {
+                                     return;
+                                 }
+                                 // CraftBukkit end
++                                if (this.respawnMerged()) return; // Sakura
                                  if (this.level().setBlock(blockposition, this.blockState, 3)) {
                                      ((ServerLevel) this.level()).getChunkSource().chunkMap.broadcast(this, new ClientboundBlockUpdatePacket(blockposition, this.level().getBlockState(blockposition)));
                                      this.discard();
-+                                    this.respawn(); // Sakura
-                                     if (block instanceof Fallable) {
-                                         ((Fallable) block).onLand(this.level(), blockposition, this.blockState, iblockdata, this);
-                                     }
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index cc30c119f519e7cd947ab40beae56e493e977176..826a910a02ae234012d10bb9ca3b677d127a6d13 100644
+index cc30c119f519e7cd947ab40beae56e493e977176..811a5224a02bb3badb1b8d6de370b7166d9f877c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -71,6 +71,60 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -71,6 +71,44 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          return !this.isRemoved();
      }
 
@@ -437,52 +439,36 @@ index cc30c119f519e7cd947ab40beae56e493e977176..826a910a02ae234012d10bb9ca3b677d
 +    }
 +
 +    @Override
-+    protected void respawn() {
-+        if (stacked <= 1) return;
++    protected boolean respawnMerged() {
++        if (stacked <= 1) return false;
 +
-+        // we create a temporary entity that will be affected by each explosion
-+        // this allows us to only keep one entity in the world in an attempt to
-+        // minimise complexity of stacked tnt explosions.
-+        var tnt = new PrimedTnt(level(), 0, 0, 0, owner);
++        PrimedTnt tnt = new PrimedTnt(EntityType.TNT, level());
 +
-+        // Copy our pre-tick state to the temporary entity
-+        entityState().apply(tnt);
-+
-+        // add the entity to the world and chunk
-+        level().addFreshEntity(tnt);
-+
-+        // Some bad plugins may change tnt momentum while we are respawning
-+        // ex: a plugin that sets tnt momentum to 0 upon spawning
-+        tnt.setDeltaMovement(entityState().momentum());
-+
-+        for (int i = stacked - 1; i >= 1; --i) {
-+            // make sure this entity cannot explode unexpectedly
-+            setFuse(100);
-+            stacked = 0;
-+
-+            // explode!
-+            explode();
++        while (stacked-- > 1) {
++            this.setFuse(100); // Prevent unwanted explosions while ticking
 +
-+            // clone state from temporary entity
-+            tnt.storeEntityState();
-+            tnt.entityState().apply(this);
++            // Cause an explosion to affect this entity
++            tnt.setPos(this.position());
++            tnt.setDeltaMovement(this.getDeltaMovement());
++            this.entityState().apply(this);
++            tnt.explode();
++            this.storeEntityState();
 +
-+            // tick, this is only to move the entity and apply physics.
-+            tick();
++            this.tick();
 +        }
 +
-+        tnt.discard();
++        return true;
 +    }
 +    // Sakura end
 +
      @Override
      public void tick() {
          if (this.level().spigotConfig.maxTntTicksPerTick > 0 && ++this.level().spigotConfig.currentPrimedTnt > this.level().spigotConfig.maxTntTicksPerTick) { return; } // Spigot
-@@ -96,6 +150,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -96,6 +134,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
          if (i <= 0) {
              // CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event
              // this.discard();
-+            this.respawn(); // Sakura
++            this.respawnMerged(); // Sakura
              if (!this.level().isClientSide) {
                  this.explode();
              }

patches/server/0020-Optimised-Explosions.patch

@@ -646,7 +646,7 @@ index a507605a04af7f576548129517029192309fd9e7..65fe46780a9f9687d328afb5cca176ab
 
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 826a910a02ae234012d10bb9ca3b677d127a6d13..2445bfc0c5604cb0185d240c9448a5c7fefa8784 100644
+index 811a5224a02bb3badb1b8d6de370b7166d9f877c..1b8d43cf54999c9a005459bc59d7b5a50bb9c1ee 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -86,6 +86,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -655,11 +655,11 @@ index 826a910a02ae234012d10bb9ca3b677d127a6d13..2445bfc0c5604cb0185d240c9448a5c7
 
 +    /*
      @Override
-     protected void respawn() {
-         if (stacked <= 1) return;
-@@ -123,6 +124,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+     protected boolean respawnMerged() {
+         if (stacked <= 1) return false;
+@@ -107,6 +108,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
 
-         tnt.discard();
+         return true;
      }
 +    */
      // Sakura end

patches/server/0021-Optimise-Fast-Movement.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise Fast Movement
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c9d94d157b4bc52742050d75b3a11b8e2769ec08..dbccada2818004edd0ae220c173c18cc5bc9acd5 100644
+index 6e2defee2a8523d7025a8341b41488192618dd1a..8d43914e515bbdd58cbc546101af643e6ba6d018 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1215,6 +1215,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1217,6 +1217,95 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
      // Paper end - detailed watchdog information
 
@@ -104,7 +104,7 @@ index c9d94d157b4bc52742050d75b3a11b8e2769ec08..dbccada2818004edd0ae220c173c18cc
      public void move(MoverType movementType, Vec3 movement) {
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
-@@ -1592,6 +1681,99 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1594,6 +1683,99 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return offsetFactor;
      }
 
@@ -205,7 +205,7 @@ index c9d94d157b4bc52742050d75b3a11b8e2769ec08..dbccada2818004edd0ae220c173c18cc
          // Paper start - optimise collisions
          final boolean xZero = movement.x == 0.0;
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 6662d48f691cf6ab515a3eb64642dcb770d1caa0..2943db8264751920f79ccda40d4bb5a16daa47df 100644
+index 3a0d82cd7a0d7ec20138effd6d84eee60ffab788..b7f9c8a6de4c07f230f99b6bfa1332166e696b49 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -201,7 +201,7 @@ public class FallingBlockEntity extends Entity {
@@ -218,10 +218,10 @@ index 6662d48f691cf6ab515a3eb64642dcb770d1caa0..2943db8264751920f79ccda40d4bb5a1
              // Paper start - fix sand duping
              if (this.isRemoved()) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 2445bfc0c5604cb0185d240c9448a5c7fefa8784..090f8a5e173f9cafc681ac5c3c2a1ec1371c2245 100644
+index 1b8d43cf54999c9a005459bc59d7b5a50bb9c1ee..ebfd24f9fb90071288f0c872c0e3fbd58bb3f2b9 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -134,7 +134,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -118,7 +118,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
              this.addDeltaMovement(0.0D, -0.04D, 0.0D); // Sakura - reduce movement allocations
          }
 

patches/server/0023-isPushedByFluid-API.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] isPushedByFluid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dbccada2818004edd0ae220c173c18cc5bc9acd5..c304338538ee45e2924a630eab10473e95e6c078 100644
+index 8d43914e515bbdd58cbc546101af643e6ba6d018..b6254947092f15b039d2af442ac36274920731a1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -678,6 +678,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -680,6 +680,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          discard();
      }
      // Sakura end
 +    public boolean pushedByFluid = true; // Sakura
 
      public boolean isLegacyTrackingEntity = false;
 
-@@ -4238,7 +4239,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4240,7 +4241,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
 
      public boolean isPushedByFluid() {

patches/server/0024-Cannon-Mechanics.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Cannon Mechanics
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 2943db8264751920f79ccda40d4bb5a16daa47df..a3ade76d9f7b4355258953bd40d9a36a4dc004fa 100644
+index b7f9c8a6de4c07f230f99b6bfa1332166e696b49..7de6f027fc8a9e7d44ae1e5fa99690dcb04a89c7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -67,6 +67,7 @@ public class FallingBlockEntity extends Entity {
@@ -38,7 +38,7 @@ index 2943db8264751920f79ccda40d4bb5a16daa47df..a3ade76d9f7b4355258953bd40d9a36a
      @Override
      public void tick() {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 090f8a5e173f9cafc681ac5c3c2a1ec1371c2245..7cb8d79e578cc23747e6b89ae4379b7a8daa328e 100644
+index ebfd24f9fb90071288f0c872c0e3fbd58bb3f2b9..d534bc3ff8d5995ced0f9f89261cdcf1835698f4 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -53,6 +53,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -54,7 +54,7 @@ index 090f8a5e173f9cafc681ac5c3c2a1ec1371c2245..7cb8d79e578cc23747e6b89ae4379b7a
      }
 
      @Override
-@@ -271,7 +277,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -255,7 +261,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
      // Paper start - Optional prevent TNT from moving in water
      @Override
      public boolean isPushedByFluid() {

patches/server/0026-Optimise-TNT-fluid-state-and-pushing.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimise TNT fluid state and pushing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c304338538ee45e2924a630eab10473e95e6c078..4c97c47e00fec68ef2e87bc981ccb811bbff6516 100644
+index b6254947092f15b039d2af442ac36274920731a1..e5df563f4d3806d72236f302391a69e4b06e6447 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2185,7 +2185,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2187,7 +2187,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.isInWater() || flag;
      }
 
@@ -18,10 +18,10 @@ index c304338538ee45e2924a630eab10473e95e6c078..4c97c47e00fec68ef2e87bc981ccb811
 
          if (entity instanceof Boat) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 7cb8d79e578cc23747e6b89ae4379b7a8daa328e..adac2a47b97e8b860e54fbf4fa37bf981c70aadc 100644
+index d534bc3ff8d5995ced0f9f89261cdcf1835698f4..dcb28daa8daf8fc2af020a7a94e3c9e51a2df63e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -132,6 +132,19 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+@@ -116,6 +116,19 @@ public class PrimedTnt extends Entity implements TraceableEntity {
      }
      */
      // Sakura end