37 lines
2 KiB
Diff
37 lines
2 KiB
Diff
|
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
|
||
|
|
index 23cfaf5c432221f2d1afe37ba657f723d6d21a73..a4e897171ce05736bcead319b7fda74d2b02fd2e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -867,6 +867,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
|
||
|
|
@@ -887,6 +888,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;
|
||
|
|
|
||
|
|
@@ -914,7 +916,7 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
Player respawnPlayer = cserver.getPlayer(entityplayer1);
|
||
|
|
- 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
|
||
|
|
cserver.getPluginManager().callEvent(respawnEvent);
|
||
|
|
// Spigot Start
|
||
|
|
if (entityplayer.connection.isDisconnected()) {
|