PaperMC/patches/server/0289-Add-PlayerPostRespawnEvent.patch

49 lines
2.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
2024-04-25 22:34:46 +02:00
index e3ce13685499e2adea5b776ec4abbdd978b6af58..8ce2826b1ded161a8220273d1fc5260ed3b6772f 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
2024-04-24 07:43:09 +02:00
@@ -751,9 +751,14 @@ public abstract class PlayerList {
2021-06-13 11:41:07 +02:00
2021-06-11 14:02:28 +02:00
boolean flag2 = false;
+ // Paper start - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
+ boolean isBedSpawn = false;
+ boolean isRespawn = false;
+ // Paper end - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
+
// CraftBukkit start - fire PlayerRespawnEvent
if (location == null) {
- boolean isBedSpawn = false;
+ // boolean isBedSpawn = false; // Paper - Add PlayerPostRespawnEvent; moved up
2021-06-11 14:02:28 +02:00
ServerLevel worldserver1 = this.server.getLevel(entityplayer.getRespawnDimension());
if (worldserver1 != null) {
Optional optional;
2024-04-24 07:43:09 +02:00
@@ -805,6 +810,7 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
location = respawnEvent.getRespawnLocation();
if (!flag) entityplayer.reset(); // SPIGOT-4785
+ isRespawn = true; // Paper - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
} else {
location.setWorld(worldserver.getWorld());
}
2024-04-24 07:43:09 +02:00
@@ -863,6 +869,13 @@ public abstract class PlayerList {
2021-06-11 14:02:28 +02:00
if (entityplayer.connection.isDisconnected()) {
this.save(entityplayer);
}
+
+ // Paper start - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
+ if (isRespawn) {
+ cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn));
+ }
+ // Paper end - Add PlayerPostRespawnEvent
2021-06-11 14:02:28 +02:00
+
// CraftBukkit end
return entityplayer1;
}