Fix a bunch of stuff with player spawn locations (#9887)

If a playerdata doesn't contain a valid, loaded world, reset
to the main world spawn point

1 files changed, 24 insertions, 0 deletions

diff --git a/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
new file mode 100644
index 0000000000..ad9460d017
--- /dev/null
+++ b/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: u9g <[email protected]>
+Date: Mon, 3 Jan 2022 23:32:42 -0500
+Subject: [PATCH] Add new overload to PersistentDataContainer#has
+
+Adds the new overload: PersistentDataContainer#has(NamespacedKey key)
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
+index ae5091433fd605c46b9c57f07114923918fad506..390d5843233d26b76f90651f49a2a1d68c0aa67f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
++++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
+@@ -161,5 +161,12 @@ public class CraftPersistentDataContainer implements PersistentDataContainer {
+     public void clear() {
+         this.customDataTags.clear();
+     }
++
++    @Override
++    public boolean has(NamespacedKey key) {
++        Preconditions.checkArgument(key != null, "The provided key for the custom value was null");
++
++        return this.customDataTags.containsKey(key.toString());
++    }
+     // Paper end
+ }