Paper/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch

49 lines
2.0 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2019-03-24 18:50:42 +01:00
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
2021-03-16 14:04:28 +01:00
index ea6c5c9305994e64831c5444666c22a96f9d36da..ae0aaaf129c44901ac72c67e50c663333ab57f9d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
2021-03-16 14:04:28 +01:00
@@ -741,9 +741,14 @@ public abstract class PlayerList {
2020-06-25 16:09:55 +02:00
// this.a(entityplayer1, entityplayer, worldserver1); // CraftBukkit - removed
boolean flag2 = false;
2019-03-24 18:50:42 +01:00
+ // Paper start
+ boolean isBedSpawn = false;
+ boolean isRespawn = false;
+ // Paper end
+
// CraftBukkit start - fire PlayerRespawnEvent
if (location == null) {
- boolean isBedSpawn = false;
2020-06-25 16:09:55 +02:00
+ // boolean isBedSpawn = false; // Paper - moved up
WorldServer worldserver1 = this.server.getWorldServer(entityplayer.getSpawnDimension());
if (worldserver1 != null) {
Optional optional;
2021-03-16 14:04:28 +01:00
@@ -794,6 +799,7 @@ public abstract class PlayerList {
2019-03-24 18:50:42 +01:00
location = respawnEvent.getRespawnLocation();
2019-05-06 04:58:04 +02:00
if (!flag) entityplayer.reset(); // SPIGOT-4785
2019-03-24 18:50:42 +01:00
+ isRespawn = true; // Paper
} else {
2020-06-25 16:09:55 +02:00
location.setWorld(worldserver.getWorld());
2019-03-24 18:50:42 +01:00
}
2021-03-16 14:04:28 +01:00
@@ -851,6 +857,13 @@ public abstract class PlayerList {
2019-03-24 18:50:42 +01:00
if (entityplayer.playerConnection.isDisconnected()) {
this.savePlayerFile(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;
}