diff --git a/patches/server/0019-Merge-Cannon-Entities.patch b/patches/server/0019-Merge-Cannon-Entities.patch
index 3cd93f4..0d2836a 100644
--- a/patches/server/0019-Merge-Cannon-Entities.patch
+++ b/patches/server/0019-Merge-Cannon-Entities.patch
@@ -178,7 +178,7 @@ index 431af1cc839e89e5d9831cd8533971a50a01d7c8..620966965f3d73cd6fdbf03dabe2605c
                              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 393e951102c49d45a135b37ccd876283c5355710..450627cc7eb70be5d926d43026bd62d8b9aa2da7 100644
+index 393e951102c49d45a135b37ccd876283c5355710..df0cef2fdf94084486221c9d8223ef8f826c5549 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -578,6 +578,108 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -208,7 +208,7 @@ index 393e951102c49d45a135b37ccd876283c5355710..450627cc7eb70be5d926d43026bd62d8
 +        stacked = stack;
 +    }
 +
-+    public List<Entity> getMergeList() {
++    public final List<Entity> getMergeList() {
 +        return mergeList;
 +    }
 +
@@ -277,14 +277,14 @@ index 393e951102c49d45a135b37ccd876283c5355710..450627cc7eb70be5d926d43026bd62d8
 +        mergeList.clear(); // clear the list to stop our tracking when merging
 +        stacked = 0; // prevent any possible duplication
 +
++        discard();
++
 +        // update api handle, this is so cannondebug can function
 +        //noinspection ConstantValue
 +        if (bukkitEntity != null) {
 +            bukkitEntity.setHandle(entity);
 +            bukkitEntity = entity.bukkitEntity;
 +        }
-+
-+        discard();
 +    }
 +    // Sakura end
  
diff --git a/patches/server/0023-isPushedByFluid-API.patch b/patches/server/0023-isPushedByFluid-API.patch
index dd0d21f..a361e80 100644
--- a/patches/server/0023-isPushedByFluid-API.patch
+++ b/patches/server/0023-isPushedByFluid-API.patch
@@ -5,11 +5,11 @@ 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 512f4e76c7f3cb255b2153c3f22ac630e7e6553a..bee38695222b9fc7b0235484eaf7afc1dcf63125 100644
+index 5eb654f99381edf1043638bbafc1579c7206f460..dd77e2ec655af6ef1556a618aa530abf2325c850 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -680,6 +680,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-         discard();
+         }
      }
      // Sakura end
 +    public boolean pushedByFluid = true; // Sakura