From 75502b6ddcae5aa84b7e97fd02d2e1551afddebc Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 21 Oct 2023 16:25:23 +1100 Subject: [PATCH] SPIGOT-7507: Fall back to world UUIDs if Dimension tag missing or invalid --- .../net/minecraft/server/players/PlayerList.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nms-patches/net/minecraft/server/players/PlayerList.patch b/nms-patches/net/minecraft/server/players/PlayerList.patch index 162b8428a..9c4525372 100644 --- a/nms-patches/net/minecraft/server/players/PlayerList.patch +++ b/nms-patches/net/minecraft/server/players/PlayerList.patch @@ -73,7 +73,7 @@ this.server = minecraftserver; this.registries = layeredregistryaccess; this.maxPlayers = i; -@@ -161,9 +193,15 @@ +@@ -161,15 +193,21 @@ NBTTagCompound nbttagcompound = this.load(entityplayer); ResourceKey resourcekey; @@ -90,6 +90,14 @@ Logger logger = PlayerList.LOGGER; Objects.requireNonNull(logger); +- resourcekey = (ResourceKey) dataresult.resultOrPartial(logger::error).orElse(World.OVERWORLD); ++ resourcekey = (ResourceKey) dataresult.resultOrPartial(logger::error).orElse(entityplayer.serverLevel().dimension()); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD + } else { +- resourcekey = World.OVERWORLD; ++ resourcekey = entityplayer.serverLevel().dimension(); // CraftBukkit - SPIGOT-7507: If no dimension, fall back to existing dimension loaded from "WorldUUID", which in turn defaults to World.OVERWORLD + } + + ResourceKey resourcekey1 = resourcekey; @@ -186,7 +224,8 @@ entityplayer.setServerLevel(worldserver1); String s1 = networkmanager.getLoggableAddress(this.server.logIPs());