1 files changed, 46 insertions, 0 deletions
diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
new file mode 100644
index 0000000000..ed4f98caf0
--- /dev/null
+++ b/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Mon, 30 May 2022 16:03:36 -0700
+Subject: [PATCH] Fix OfflinePlayer#getBedSpawnLocation
+
+When calling getBedSpawnLocation on an
+instance of CraftOfflinePlayer the world was incorrect
+due to the logic for reading the NBT not being up-to-date.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+index ffc813934e719129d3805a2a181093c45db7cc71..9e01ef76bc6d18ab622fbec729f8bde3aa8d3e41 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+@@ -36,6 +36,7 @@ import org.bukkit.profile.PlayerProfile;
+ 
+ @SerializableAs("Player")
+ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializable {
++    private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper
+     private final GameProfile profile;
+     private final CraftServer server;
+     private final PlayerDataStorage storage;
+@@ -330,11 +331,20 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
+         if (data == null) return null;
+ 
+         if (data.contains("SpawnX") && data.contains("SpawnY") && data.contains("SpawnZ")) {
+-            String spawnWorld = data.getString("SpawnWorld");
+-            if (spawnWorld.equals("")) {
+-                spawnWorld = this.server.getWorlds().get(0).getName();
++            // Paper start - fix wrong world
++            final float respawnAngle = data.getFloat("SpawnAngle");
++            org.bukkit.World spawnWorld = this.server.getWorld(data.getString("SpawnWorld")); // legacy
++            if (data.contains("SpawnDimension")) {
++                com.mojang.serialization.DataResult<net.minecraft.resources.ResourceKey<net.minecraft.world.level.Level>> result = net.minecraft.world.level.Level.RESOURCE_KEY_CODEC.parse(net.minecraft.nbt.NbtOps.INSTANCE, data.get("SpawnDimension"));
++                net.minecraft.resources.ResourceKey<net.minecraft.world.level.Level> levelKey = result.resultOrPartial(LOGGER::error).orElse(net.minecraft.world.level.Level.OVERWORLD);
++                net.minecraft.server.level.ServerLevel level = this.server.console.getLevel(levelKey);
++                spawnWorld = level != null ? level.getWorld() : spawnWorld;
+             }
+-            return new Location(this.server.getWorld(spawnWorld), data.getInt("SpawnX"), data.getInt("SpawnY"), data.getInt("SpawnZ"));
++            if (spawnWorld == null) {
++                return null;
++            }
++            return new Location(spawnWorld, data.getInt("SpawnX"), data.getInt("SpawnY"), data.getInt("SpawnZ"), respawnAngle, 0);
++            // Paper end
+         }
+         return null;
+     }