diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
commit | b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb (patch) | |
tree | 429b9bd9ef2cc19e42b8656ef25ca1548f5efe88 /patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch | |
parent | 81c5901c674e6ee89dbfed4848c9eb645bfb0f16 (diff) | |
download | Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.tar.gz Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.zip |
Revert "re-add distance map patch"
This reverts commit 81c5901c674e6ee89dbfed4848c9eb645bfb0f16.
Diffstat (limited to 'patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch')
-rw-r--r-- | patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch new file mode 100644 index 0000000000..6dac578ff6 --- /dev/null +++ b/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch @@ -0,0 +1,36 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: HexedHero <[email protected]> +Date: Fri, 23 Apr 2021 22:42:42 +0100 +Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end + portal + + +diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java +index 248fd1ff7a09cad178a87cb0d9b3be6c9d2f1473..11b44bf31cc0feae3c568bf100801633c0b34906 100644 +--- a/src/main/java/net/minecraft/server/players/PlayerList.java ++++ b/src/main/java/net/minecraft/server/players/PlayerList.java +@@ -805,6 +805,7 @@ public abstract class PlayerList { + + // Paper start + boolean isBedSpawn = false; ++ boolean isAnchorSpawn = false; + boolean isRespawn = false; + boolean isLocAltered = false; // Paper - Fix SPIGOT-5989 + // Paper end +@@ -825,6 +826,7 @@ public abstract class PlayerList { + if (optional.isPresent()) { + BlockState iblockdata = worldserver1.getBlockState(blockposition); + boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR); ++ isAnchorSpawn = flag3; // Paper - Fix anchor respawn acting as a bed respawn from the end portal + Vec3 vec3d = (Vec3) optional.get(); + float f1; + +@@ -853,7 +855,7 @@ public abstract class PlayerList { + } + + Player respawnPlayer = entityplayer1.getBukkitEntity(); +- PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2, reason); ++ PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, reason); // Paper - Fix anchor respawn acting as a bed respawn from the end portal + this.cserver.getPluginManager().callEvent(respawnEvent); + // Spigot Start + if (entityplayer.connection.isDisconnected()) { |