1 files changed, 0 insertions, 63 deletions
diff --git a/patches/removed/1.21/0393-Fix-SPIGOT-5989.patch b/patches/removed/1.21/0393-Fix-SPIGOT-5989.patch
deleted file mode 100644
index 5b41e0742c..0000000000
--- a/patches/removed/1.21/0393-Fix-SPIGOT-5989.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: JRoy <[email protected]>
-Date: Wed, 15 Jul 2020 21:42:52 -0400
-Subject: [PATCH] Fix SPIGOT-5989
-
-Before this fix, if a player was respawning to a respawn anchor and
-the respawn location was modified away from the anchor with the
-PlayerRespawnEvent, the anchor would still lose some charge.
-This fixes that by checking if the modified spawn location is
-still at a respawn anchor.
-
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 935061ed5c22b48e43d27fe0840cc69fb60d5344..97a3f29414cd9f11e6a790cb30f7ef25a836b06c 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -804,6 +804,7 @@ public abstract class PlayerList {
-         // Paper start - Add PlayerPostRespawnEvent
-         boolean isBedSpawn = false;
-         boolean isRespawn = false;
-+        boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
-         // Paper end - Add PlayerPostRespawnEvent
- 
-         // CraftBukkit start - fire PlayerRespawnEvent
-@@ -814,7 +815,7 @@ public abstract class PlayerList {
-                 Optional optional;
- 
-                 if (blockposition != null) {
--                    optional = net.minecraft.world.entity.player.Player.findRespawnPositionAndUseSpawnBlock(worldserver1, blockposition, f, flag1, flag);
-+                    optional = net.minecraft.world.entity.player.Player.findRespawnPositionAndUseSpawnBlock(worldserver1, blockposition, f, flag1, true); // Paper - Fix SPIGOT-5989
-                 } else {
-                     optional = Optional.empty();
-                 }
-@@ -858,7 +859,12 @@ public abstract class PlayerList {
-             }
-             // Spigot End
- 
--            location = respawnEvent.getRespawnLocation();
-+            // Paper start - Fix SPIGOT-5989
-+            if (!location.equals(respawnEvent.getRespawnLocation()) ) {
-+                location = respawnEvent.getRespawnLocation();
-+                isLocAltered = true;
-+            }
-+            // Paper end - Fix SPIGOT-5989
-             if (!flag) entityplayer.reset(); // SPIGOT-4785
-             isRespawn = true; // Paper - Add PlayerPostRespawnEvent
-         } else {
-@@ -896,8 +902,14 @@ public abstract class PlayerList {
-         }
-         // entityplayer1.initInventoryMenu();
-         entityplayer1.setHealth(entityplayer1.getHealth());
--        if (flag2) {
--            entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F, worldserver1.getRandom().nextLong()));
-+        // Paper start - Fix SPIGOT-5989
-+        if (flag2 && !isLocAltered) {
-+            if (!flag1) {
-+                BlockState data = worldserver1.getBlockState(blockposition);
-+                worldserver1.setBlock(blockposition, data.setValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE, data.getValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE) - 1), 3);
-+            }
-+            entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) location.getX(), (double) location.getY(), (double) location.getZ(), 1.0F, 1.0F, worldserver1.getRandom().nextLong()));
-+        // Paper end - Fix SPIGOT-5989
-         }
-         // Added from changeDimension
-         this.sendAllPlayerInfo(entityplayer); // Update health, etc...