aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch')
-rw-r--r--patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
new file mode 100644
index 0000000000..7fd6ccefcc
--- /dev/null
+++ b/patches/server/0584-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 690bb831c41a344b284c16f2c44954f652784bdb..b4b1678edb87269aa35ab07c0d91d067ca9b0097 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()) {