13
0
geforkt von Mirrors/Paper
Paper/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch

37 Zeilen
2.0 KiB
Diff

2021-06-11 14:02:28 +02: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
2022-07-27 22:55:55 +02:00
index c44c57df38d42dee60ac07cee9797e31692af10d..5b3e99c7d7af09a035278b90806853505b54f1fa 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2022-07-27 22:55:55 +02:00
@@ -855,6 +855,7 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
// Paper start
boolean isBedSpawn = false;
+ boolean isAnchorSpawn = false;
boolean isRespawn = false;
boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
// Paper end
2022-07-27 22:55:55 +02:00
@@ -875,6 +876,7 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02: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;
2022-07-27 22:55:55 +02:00
@@ -903,7 +905,7 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
}
Player respawnPlayer = entityplayer1.getBukkitEntity();
2021-06-11 14:02:28 +02: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 04:59:31 +02:00
this.cserver.getPluginManager().callEvent(respawnEvent);
2021-06-11 14:02:28 +02:00
// Spigot Start
if (entityplayer.connection.isDisconnected()) {