From 98e0c5c715b9fb2dd50c26a996c6441ab14235ab Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 13 Feb 2021 10:31:49 +1100 Subject: [PATCH] SPIGOT-6347: Nether Portals Default to Nether, even in Nether By: md_5 --- paper-server/nms-patches/Entity.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER; +@@ -1646,14 +1950,20 @@ + + if (this.inPortal) { + MinecraftServer minecraftserver = worldserver.getMinecraftServer(); +- ResourceKey resourcekey = this.world.getDimensionKey() == World.THE_NETHER ? World.OVERWORLD : World.THE_NETHER; ++ ResourceKey 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) {