From d97d91871d7b2003591d9a9d59ee9c2306d3178a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Feb 2021 10:31:49 +1100
Subject: [PATCH] SPIGOT-6347: Nether Portals Default to Nether, even in Nether

---
 nms-patches/Entity.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch
index f0777967d..5619bd4aa 100644
--- a/nms-patches/Entity.patch
+++ b/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) {