From 921b38c6586b17aae50fcf0a3acabb6af40c9b0c Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Sat, 4 May 2024 03:50:19 +0100
Subject: [PATCH] Fix tnt being unable to merge while falling

---
 patches/server/0018-Merge-Cannon-Entities.patch  | 4 ++--
 patches/server/0021-Specialised-Explosions.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/server/0018-Merge-Cannon-Entities.patch b/patches/server/0018-Merge-Cannon-Entities.patch
index a0ad032..0bf6ea3 100644
--- a/patches/server/0018-Merge-Cannon-Entities.patch
+++ b/patches/server/0018-Merge-Cannon-Entities.patch
@@ -447,7 +447,7 @@ index 743aac4ba5d08ef3e6b67136bd4919b62411a7a0..99a0bec7eb5be527b41248b365b037a5
                                      ((ServerLevel) this.level()).getChunkSource().chunkMap.broadcast(this, new ClientboundBlockUpdatePacket(blockposition, this.level().getBlockState(blockposition)));
                                      this.discard(EntityRemoveEvent.Cause.DESPAWN);
 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 90f10473ae441d68333cd497c718a3c982544533..6e096594016be726e19b18c8a657ccbea717b926 100644
+index 90f10473ae441d68333cd497c718a3c982544533..4f695305794c2564517d99b4edd3180d7ea07845 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -72,6 +72,44 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -465,7 +465,7 @@ index 90f10473ae441d68333cd497c718a3c982544533..6e096594016be726e19b18c8a657ccbe
 +        return entity instanceof PrimedTnt tnt
 +            && tnt.getFuse() + 1 == getFuse()
 +            // required to prevent issues with powdered snow
-+            && (tnt.entityState().fallDistance() == 0.0f && fallDistance == 0.0f
++            && (tnt.entityState().fallDistance() == fallDistance
 +              || tnt.entityState().fallDistance() > 2.5f && fallDistance > 2.5f);
 +    }
 +
diff --git a/patches/server/0021-Specialised-Explosions.patch b/patches/server/0021-Specialised-Explosions.patch
index 4393461..5018a19 100644
--- a/patches/server/0021-Specialised-Explosions.patch
+++ b/patches/server/0021-Specialised-Explosions.patch
@@ -436,11 +436,11 @@ index 51fa57e8b9d5c9ee563ec3608a437c69da08d32c..ec7d7f22b267ae6572e6005f10221755
  
      @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 6e096594016be726e19b18c8a657ccbea717b926..30c3e31148d23998ce9007691c30d1d518a2b86d 100644
+index 4f695305794c2564517d99b4edd3180d7ea07845..8acef487b0579febb3497cc88b23c4fc74492571 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -86,28 +86,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
-             && (tnt.entityState().fallDistance() == 0.0f && fallDistance == 0.0f
+             && (tnt.entityState().fallDistance() == fallDistance
                || tnt.entityState().fallDistance() > 2.5f && fallDistance > 2.5f);
      }
 -
@@ -470,7 +470,7 @@ index 6e096594016be726e19b18c8a657ccbea717b926..30c3e31148d23998ce9007691c30d1d5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index fa1a06e6455390c3c945d988a3d4ee9a9ea92d38..985386901b4785e83fd8b85db9e05847f9165d1e 100644
+index c9cf9373d3eae4e54ae27fbb8993f858e91e98cc..8e80e602368d784a64c68a061505d4e08997566b 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -55,9 +55,11 @@ public class Explosion {