diff --git a/paper-server/nms-patches/Entity.patch b/paper-server/nms-patches/Entity.patch
index f0777967d0..5619bd4aa2 100644
--- a/paper-server/nms-patches/Entity.patch
+++ b/paper-server/nms-patches/Entity.patch
@@ -500,8 +500,12 @@
      }
  
      protected boolean q(Entity entity) {
-@@ -1649,11 +1953,17 @@
-                 ResourceKey<World> resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER;
+@@ -1646,14 +1950,20 @@
+ 
+             if (this.inPortal) {
+                 MinecraftServer minecraftserver = worldserver.getMinecraftServer();
+-                ResourceKey<World> resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER;
++                ResourceKey<World> resourcekey = this.world.getTypeKey() == DimensionManager.THE_NETHER ? World.OVERWORLD : World.THE_NETHER; // CraftBukkit
                  WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey);
  
 -                if (worldserver1 != null && minecraftserver.getAllowNether() && !this.isPassenger() && this.portalTicks++ >= i) {