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

diff --git a/patches/server/0884-ItemStack-damage-API.patch b/patches/server/0884-ItemStack-damage-API.patch
new file mode 100644
index 0000000000..83ab1c3ff4
--- /dev/null
+++ b/patches/server/0884-ItemStack-damage-API.patch
@@ -0,0 +1,70 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 8 May 2022 13:35:45 -0700
+Subject: [PATCH] ItemStack damage API
+
+Adds methods notify clients about item breaks and
+to simulate damage done to an itemstack and all
+the logic associated with damaging them
+
+== AT ==
+public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+index e76dfca102ef9b497fc28c9c221ac33fe3c31c10..87a5260a94dc3388bad2803c64ecf15a8063ba9d 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -1017,6 +1017,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+         throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
+     }
+ 
++    @Override
++    public void broadcastSlotBreak(org.bukkit.inventory.EquipmentSlot slot) {
++        this.getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
++    }
++
++    @Override
++    public void broadcastSlotBreak(org.bukkit.inventory.EquipmentSlot slot, Collection<org.bukkit.entity.Player> players) {
++        if (players.isEmpty()) {
++            return;
++        }
++        final net.minecraft.network.protocol.game.ClientboundEntityEventPacket packet = new net.minecraft.network.protocol.game.ClientboundEntityEventPacket(
++            this.getHandle(),
++            net.minecraft.world.entity.LivingEntity.entityEventForEquipmentBreak(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot))
++        );
++        players.forEach(player -> ((CraftPlayer) player).getHandle().connection.send(packet));
++    }
++
++    @Override
++    public ItemStack damageItemStack(ItemStack stack, int amount) {
++        final net.minecraft.world.item.ItemStack nmsStack;
++        if (stack instanceof CraftItemStack craftItemStack) {
++            if (craftItemStack.handle == null || craftItemStack.handle.isEmpty()) {
++                return stack;
++            }
++            nmsStack = craftItemStack.handle;
++        } else {
++            nmsStack = CraftItemStack.asNMSCopy(stack);
++            stack = CraftItemStack.asCraftMirror(nmsStack); // mirror to capture changes in hurt logic & events
++        }
++        this.damageItemStack0(nmsStack, amount, null);
++        return stack;
++    }
++
++    @Override
++    public void damageItemStack(org.bukkit.inventory.EquipmentSlot slot, int amount) {
++        final net.minecraft.world.entity.EquipmentSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
++        this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot);
++    }
++
++    private void damageItemStack0(net.minecraft.world.item.ItemStack nmsStack, int amount, net.minecraft.world.entity.EquipmentSlot slot) {
++        nmsStack.hurtAndBreak(amount, this.getHandle(), livingEntity -> {
++            if (slot != null) {
++                livingEntity.broadcastBreakEvent(slot);
++            }
++        });
++    }
++
+     @Override
+     public void knockback(double strength, double directionX, double directionZ) {
+         Preconditions.checkArgument(strength > 0, "Knockback strength must be > 0");