More work

2022-07-27 21:49:24 +02:00 · 2022-07-27 21:49:24 +02:00 · 08828fde02
commit 08828fde02
parent afb9e818fc
281 changed files with 457 additions and 472 deletions
--- a/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MisterVector <whizkid3000@hotmail.com>
+Date: Fri, 26 Oct 2018 21:31:00 -0700
+Subject: [PATCH] Implement PlayerPostRespawnEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 7fc546e38c68a173208d62a8d0944c915b6df44a..3d16541cc8e2d9db49fc95a0b640bdbbda8d56e2 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -730,9 +730,14 @@ public abstract class PlayerList {
+ 
+         boolean flag2 = false;
+ 
+        // Paper start
+        boolean isBedSpawn = false;
+        boolean isRespawn = false;
+        // Paper end
+
+         // CraftBukkit start - fire PlayerRespawnEvent
+         if (location == null) {
+-            boolean isBedSpawn = false;
+            // boolean isBedSpawn = false; // Paper - moved up
+             ServerLevel worldserver1 = this.server.getLevel(entityplayer.getRespawnDimension());
+             if (worldserver1 != null) {
+                 Optional optional;
+@@ -784,6 +789,7 @@ public abstract class PlayerList {
+ 
+             location = respawnEvent.getRespawnLocation();
+             if (!flag) entityplayer.reset(); // SPIGOT-4785
+            isRespawn = true; // Paper
+         } else {
+             location.setWorld(worldserver.getWorld());
+         }
+@@ -841,6 +847,13 @@ public abstract class PlayerList {
+         if (entityplayer.connection.isDisconnected()) {
+             this.save(entityplayer);
+         }
+
+        // Paper start
+        if (isRespawn) {
+            cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn));
+        }
+        // Paper end
+
+         // CraftBukkit end
+         return entityplayer1;
+     }