1 files changed, 62 insertions, 0 deletions
diff --git a/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
new file mode 100644
index 0000000000..26cdea3136
--- /dev/null
+++ b/patches/server/0531-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: HexedHero <[email protected]>
+Date: Fri, 23 Apr 2021 22:42:42 +0100
+Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
+
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 22da7f7c4b033d31b7a71878e34562a4370a4bd4..c8124bf451f5d03374f32a04b9b28fc9d97897ae 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -2706,7 +2706,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+             case PERFORM_RESPAWN:
+                 if (this.player.wonGame) {
+                     this.player.wonGame = false;
+-                    this.player = this.server.getPlayerList().respawn(this.player, true, RespawnReason.END_PORTAL);
++                    this.player = this.server.getPlayerList().respawn(this.player, this.server.getLevel(this.player.getRespawnDimension()), true, null, true, RespawnReason.END_PORTAL, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - Expand PlayerRespawnEvent
+                     CriteriaTriggers.CHANGED_DIMENSION.trigger(this.player, Level.END, Level.OVERWORLD);
+                 } else {
+                     if (this.player.getHealth() > 0.0F) {
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 975cd4530e1ad903df32bb8b3d760ca462b42b5c..40d1451b43228b802aabe8c021ad781ceb8d8df8 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -779,6 +779,12 @@ public abstract class PlayerList {
+     }
+ 
+     public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
++        // Paper start - Expand PlayerRespawnEvent
++        return respawn(entityplayer, worldserver, flag, location, avoidSuffocation, reason, new org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag[0]);
++    }
++
++    public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) {
++        // Paper end - Expand PlayerRespawnEvent
+         entityplayer.stopRiding(); // CraftBukkit
+         this.players.remove(entityplayer);
+         this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
+@@ -820,6 +826,7 @@ public abstract class PlayerList {
+ 
+         // Paper start - Add PlayerPostRespawnEvent
+         boolean isBedSpawn = false;
++        boolean isAnchorSpawn = false; // Paper - Fix PlayerRespawnEvent
+         boolean isRespawn = false;
+         boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
+         // Paper end - Add PlayerPostRespawnEvent
+@@ -840,6 +847,7 @@ public abstract class PlayerList {
+                 if (optional.isPresent()) {
+                     BlockState iblockdata = worldserver1.getBlockState(blockposition);
+                     boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
++                    isAnchorSpawn = flag3; // Paper - Fix PlayerRespawnEvent
+                     Vec3 vec3d = (Vec3) optional.get();
+                     float f1;
+ 
+@@ -868,7 +876,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, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - PlayerRespawnEvent changes
+             this.cserver.getPluginManager().callEvent(respawnEvent);
+             // Spigot Start
+             if (entityplayer.connection.isDisconnected()) {