diff --git a/patches/server/0021-Specialised-Explosions.patch b/patches/server/0021-Specialised-Explosions.patch
index 5018a19..0d15879 100644
--- a/patches/server/0021-Specialised-Explosions.patch
+++ b/patches/server/0021-Specialised-Explosions.patch
@@ -23,7 +23,7 @@ index 0fd814f1d65c111266a2b20f86561839a4cef755..932f7a0d030d2d4932e6e6d4a5805e9b
          if (index >= 0) {
 diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..929231896288c8355c17ba878d3dc296e9b258da
+index 0000000000000000000000000000000000000000..d741021bb53d56383ea751441163c7ff7223b16a
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java
 @@ -0,0 +1,197 @@
@@ -209,14 +209,14 @@ index 0000000000000000000000000000000000000000..929231896288c8355c17ba878d3dc296
 +                double density = this.getBlockDensity(pos, entity, this.recentBlockCache, this.mutablePos); // Paper - Optimize explosions // Paper - optimise explosions
 +                double exposure = (1.0D - distanceFromBottom) * density;
 +
-+                x *= exposure;
-+                y *= exposure;
-+                z *= exposure;
-+
 +                if (exposure == 0.0) {
 +                    return;
 +                }
 +
++                x *= exposure;
++                y *= exposure;
++                z *= exposure;
++
 +                for (int i = 0; i < potential; ++i) {
 +                    entity.addDeltaMovement(x, y, z);
 +                }
@@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..929231896288c8355c17ba878d3dc296
 +}
 diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b94861d545cefb0e68a83efa6812a1ff4a381027
+index 0000000000000000000000000000000000000000..39cd91c1e19585d24bbe1333bf15985b0d1a0dab
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java
-@@ -0,0 +1,179 @@
+@@ -0,0 +1,186 @@
 +package me.samsuik.sakura.explosion.special;
 +
 +import io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet;
@@ -248,6 +248,7 @@ index 0000000000000000000000000000000000000000..b94861d545cefb0e68a83efa6812a1ff
 +import net.minecraft.world.level.Level;
 +import net.minecraft.world.phys.AABB;
 +import net.minecraft.world.phys.Vec3;
++import org.bukkit.util.Vector;
 +import org.jetbrains.annotations.Nullable;
 +
 +import java.util.List;
@@ -334,8 +335,14 @@ index 0000000000000000000000000000000000000000..b94861d545cefb0e68a83efa6812a1ff
 +        }
 +    }
 +
++    private Vector getCauseOrigin() {
++        Vector origin = this.cause.getOriginVector();
++        return origin == null ? new Vector(this.x, this.y, this.z) : origin;
++    }
++
 +    private EntityState nextSourceVelocity() {
-+        PrimedTnt tnt = new PrimedTnt(EntityType.TNT, this.level);
++        Vector origin = this.getCauseOrigin(); // valid position to use while creating a temporary entity
++        PrimedTnt tnt = new PrimedTnt(this.level, origin.getX(), origin.getY(), origin.getZ(), null);
 +        this.cause.entityState().apply(tnt);
 +        this.impactCannonEntity(tnt, this.position, 1, this.radius() * 2.0f);
 +        return EntityState.of(tnt);
@@ -360,7 +367,7 @@ index 0000000000000000000000000000000000000000..b94861d545cefb0e68a83efa6812a1ff
 +        // iterate over the entityTickList to find entities that are exploding in the same position.
 +        while ((index = entities.advanceRawIterator(index)) != -1) {
 +            Entity foundEntity = entities.rawGet(index);
-+            if (!foundEntity.compareState(this.cause) || !foundEntity.isSafeToMergeInto(this.cause))
++            if (foundEntity.isRemoved() || !foundEntity.compareState(this.cause) || !foundEntity.isSafeToMergeInto(this.cause))
 +                break;
 +            base += foundEntity.getStacked();
 +            foundEntity.discard();
diff --git a/patches/server/0041-Configure-cannon-physics-by-version.patch b/patches/server/0041-Configure-cannon-physics-by-version.patch
index 0fb69a0..a26f559 100644
--- a/patches/server/0041-Configure-cannon-physics-by-version.patch
+++ b/patches/server/0041-Configure-cannon-physics-by-version.patch
@@ -68,7 +68,7 @@ index 19086bbfdf3a015eafec5ca868c8d2451f554ef0..510d722fffd4bdcee2db42aefa662c49
          if (xSmaller && z != 0.0) {
              z = performAABBCollisionsZ(axisalignedbb, z, aabbs);
 diff --git a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java
-index 929231896288c8355c17ba878d3dc296e9b258da..ca7819aa341529d8515e9db7ffe3b9d9186e05f3 100644
+index d741021bb53d56383ea751441163c7ff7223b16a..2e83f0efc47ddabbd2aa5ec8f95c40f95e6e76e0 100644
 --- a/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java
 +++ b/src/main/java/me/samsuik/sakura/explosion/special/SpecialisedExplosion.java
 @@ -169,9 +169,15 @@ public abstract class SpecialisedExplosion<T extends Entity> extends Explosion {
@@ -89,10 +89,10 @@ index 929231896288c8355c17ba878d3dc296e9b258da..ca7819aa341529d8515e9db7ffe3b9d9
              if (distance != 0.0D) {
                  x /= distance;
 diff --git a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java
-index b94861d545cefb0e68a83efa6812a1ff4a381027..26e03034f037ff236b8be781a433fdfe69eb0764 100644
+index 39cd91c1e19585d24bbe1333bf15985b0d1a0dab..c4196a7b983efa9a53c1ef2339dc4ee5d6f3bfe2 100644
 --- a/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java
 +++ b/src/main/java/me/samsuik/sakura/explosion/special/TntExplosion.java
-@@ -36,6 +36,13 @@ public final class TntExplosion extends SpecialisedExplosion<PrimedTnt> {
+@@ -37,6 +37,13 @@ public final class TntExplosion extends SpecialisedExplosion<PrimedTnt> {
          this.bounds = new AABB(x, y, z, x, y, z);
      }
  
@@ -393,7 +393,7 @@ index 05c5b6be55bf6a81ff454532b40a372f9b9c8e13..b5ecadeb96750cbdca2023eefe777859
      }
  
 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 9493fbae91f0ef6c3aaf81e548c225748f6f83b5..8a7864943bf6b3baaa4a5ca5c2052411af3d23da 100644
+index f5d391ae2a9b015f4dd753f7658ac359bc5db43e..c65e178206041600b09b238214440ed6690329e7 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -60,6 +60,13 @@ public class PrimedTnt extends Entity implements TraceableEntity {