diff --git a/patches/server/0002-Sakura-Utils.patch b/patches/server/0002-Sakura-Utils.patch
index cfaa6d5..c52ed4a 100644
--- a/patches/server/0002-Sakura-Utils.patch
+++ b/patches/server/0002-Sakura-Utils.patch
@@ -63,10 +63,10 @@ index 0000000000000000000000000000000000000000..ff4909a2ba8f451a7c6aa55ee98e33c8
 +}
 diff --git a/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java b/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..8f4ac8acd2e0752e7a615d152b8047d790947b9f
+index 0000000000000000000000000000000000000000..00fe34d827c01d8772fa9506de75ced7d16e5d48
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
 +package me.samsuik.sakura.utils.collections;
 +
 +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
@@ -86,8 +86,9 @@ index 0000000000000000000000000000000000000000..8f4ac8acd2e0752e7a615d152b8047d7
 +
 +    @Override
 +    public ChunkMap.TrackedEntity remove(int k) {
-+        entityList.remove(k);
-+        return super.remove(k);
++        ChunkMap.TrackedEntity v = super.remove(k);
++        entityList.remove(v);
++        return v;
 +    }
 +
 +    @Override
diff --git a/patches/server/0013-Use-Optimised-TrackedEntityMap.patch b/patches/server/0013-Use-Optimised-TrackedEntityMap.patch
index 2d701cc..256750a 100644
--- a/patches/server/0013-Use-Optimised-TrackedEntityMap.patch
+++ b/patches/server/0013-Use-Optimised-TrackedEntityMap.patch
@@ -4,22 +4,6 @@ Date: Thu, 3 Aug 2023 12:54:52 +0100
 Subject: [PATCH] Use Optimised TrackedEntityMap
 
 
-diff --git a/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java b/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java
-index 8f4ac8acd2e0752e7a615d152b8047d790947b9f..1394adbe98a24f74fc7892e1b39ab1502fe082c1 100644
---- a/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java
-+++ b/src/main/java/me/samsuik/sakura/utils/collections/TrackedEntityChunkMap.java
-@@ -17,8 +17,9 @@ public class TrackedEntityChunkMap extends Int2ObjectOpenHashMap<ChunkMap.Tracke
- 
-     @Override
-     public ChunkMap.TrackedEntity remove(int k) {
--        entityList.remove(k);
--        return super.remove(k);
-+        var v = super.remove(k);
-+        entityList.remove(v);
-+        return v;
-     }
- 
-     @Override
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
 index 45f0e7ef92c32dc51b81c0cc9f1d1a2fbab02599..e3ee8b66dfabb643c2b0d47bef20af4d8680e008 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java