diff --git a/nms-patches/net/minecraft/server/level/WorldServer.patch b/nms-patches/net/minecraft/server/level/WorldServer.patch
index ce82ee1a3..5b3139d0d 100644
--- a/nms-patches/net/minecraft/server/level/WorldServer.patch
+++ b/nms-patches/net/minecraft/server/level/WorldServer.patch
@@ -593,26 +593,16 @@
      }
  
      @Override
-@@ -1737,7 +1953,9 @@
- 
-         a() {}
- 
--        public void onCreated(Entity entity) {}
-+        public void onCreated(Entity entity) {
-+            entity.inWorld = true; // CraftBukkit - Mark entity as in world
-+        }
- 
-         public void onDestroyed(Entity entity) {
-             WorldServer.this.getScoreboard().entityRemoved(entity);
-@@ -1785,6 +2003,7 @@
+@@ -1785,6 +2001,8 @@
              }
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
++            entity.inWorld = true; // CraftBukkit - Mark entity as in world
 +            entity.valid = true; // CraftBukkit
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -1821,6 +2040,14 @@
+@@ -1821,6 +2039,14 @@
              }
  
              entity.updateDynamicGameEventListener(DynamicGameEventListener::remove);