Move logging patches after adventure

2024-04-23 11:21:16 -07:00 · 2024-04-23 11:21:16 -07:00 · 00c14f2e7b
commit 00c14f2e7b
parent f2c45ed1d3
1050 changed files with 36 additions and 0 deletions
--- a/patches/unapplied/server/0299-Add-PlayerPostRespawnEvent.patch
+++ b/patches/unapplied/server/0299-Add-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] Add PlayerPostRespawnEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index bc440f9a239d3935bf6837edf815d4fdc6093655..6bd83549e2ff84b1bc993ef2be79a336ced28f67 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -752,9 +752,14 @@ public abstract class PlayerList {
+ 
+         boolean flag2 = false;
+ 
+        // Paper start - Add PlayerPostRespawnEvent
+        boolean isBedSpawn = false;
+        boolean isRespawn = false;
+        // Paper end - Add PlayerPostRespawnEvent
+
+         // CraftBukkit start - fire PlayerRespawnEvent
+         if (location == null) {
+-            boolean isBedSpawn = false;
+            // boolean isBedSpawn = false; // Paper - Add PlayerPostRespawnEvent; moved up
+             ServerLevel worldserver1 = this.server.getLevel(entityplayer.getRespawnDimension());
+             if (worldserver1 != null) {
+                 Optional optional;
+@@ -806,6 +811,7 @@ public abstract class PlayerList {
+ 
+             location = respawnEvent.getRespawnLocation();
+             if (!flag) entityplayer.reset(); // SPIGOT-4785
+            isRespawn = true; // Paper - Add PlayerPostRespawnEvent
+         } else {
+             location.setWorld(worldserver.getWorld());
+         }
+@@ -864,6 +870,13 @@ public abstract class PlayerList {
+         if (entityplayer.connection.isDisconnected()) {
+             this.save(entityplayer);
+         }
+
+        // Paper start - Add PlayerPostRespawnEvent
+        if (isRespawn) {
+            cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn));
+        }
+        // Paper end - Add PlayerPostRespawnEvent
+
+         // CraftBukkit end
+         return entityplayer1;
+     }