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, 0 insertions, 62 deletions

diff --git a/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
deleted file mode 100644
index 754c03c42c..0000000000
--- a/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Madeline Miller <[email protected]>
-Date: Thu, 31 Dec 2020 12:48:19 +1000
-Subject: [PATCH] Implement API to get Material from Boats and Minecarts
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-index f332bd4e6f663147c9ef6ce03d926feb74b55e93..d161cbf9c83cd78593864850b98f688da2c85aa5 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
-@@ -79,6 +79,13 @@ public class CraftBoat extends CraftVehicle implements Boat {
-         this.getHandle().landBoats = workOnLand;
-     }
- 
-+    // Paper start
-+    @Override
-+    public org.bukkit.Material getBoatMaterial() {
-+        return org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this.getHandle().getDropItem());
-+    }
-+    // Paper end
-+
-     @Override
-     public Status getStatus() {
-         return CraftBoat.boatStatusFromNms(this.getHandle().status);
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-index ee010d53f8c671d17d68f3f43dca9978e23ac8ab..8920af5a0dfe737c1f38d906b53e6a278456d2aa 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
-@@ -1,8 +1,10 @@
- package org.bukkit.craftbukkit.entity;
- 
- import net.minecraft.world.entity.vehicle.AbstractMinecart;
-+import net.minecraft.world.item.Items; // Paper
- import net.minecraft.world.level.block.Blocks;
- import net.minecraft.world.level.block.state.BlockState;
-+import org.bukkit.Material; // Paper
- import org.bukkit.block.data.BlockData;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.craftbukkit.block.data.CraftBlockData;
-@@ -68,6 +70,22 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
-         this.getHandle().setDerailedVelocityMod(derailed);
-     }
- 
-+    // Paper start
-+    @Override
-+    public Material getMinecartMaterial() {
-+         net.minecraft.world.item.Item minecartItem = switch (getHandle().getMinecartType()) {
-+            case CHEST -> Items.CHEST_MINECART;
-+            case FURNACE ->  Items.FURNACE_MINECART;
-+            case TNT ->  Items.TNT_MINECART;
-+            case HOPPER ->  Items.HOPPER_MINECART;
-+            case COMMAND_BLOCK ->  Items.COMMAND_BLOCK_MINECART;
-+            case RIDEABLE, SPAWNER ->  Items.MINECART;
-+        };
-+
-+        return CraftMagicNumbers.getMaterial(minecartItem);
-+    }
-+    // Paper end
-+
-     @Override
-     public AbstractMinecart getHandle() {
-         return (AbstractMinecart) this.entity;