2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
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
2021-11-27 10:42:09 +00:00
index 29864d3c25cea7bbb84a431a82e7b80f4af2966d..5f099d45203f155abb23c9241b55d34e04f2aa7e 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2021-11-25 11:20:13 +00:00
@@ -847,6 +847,7 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
// Paper start
boolean isBedSpawn = false;
+ boolean isAnchorSpawn = false;
boolean isRespawn = false;
boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
// Paper end
2021-11-25 11:20:13 +00:00
@@ -867,6 +868,7 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
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;
2021-11-25 11:20:13 +00:00
@@ -895,7 +897,7 @@ public abstract class PlayerList {
2021-06-11 12:02:28 +00:00
}
2021-06-20 19:25:59 +00:00
Player respawnPlayer = entityplayer1.getBukkitEntity();
2021-06-11 12:02:28 +00:00
- PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2);
+ PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
2021-06-15 02:59:31 +00:00
this.cserver.getPluginManager().callEvent(respawnEvent);
2021-06-11 12:02:28 +00:00
// Spigot Start
if (entityplayer.connection.isDisconnected()) {