testserver/Spigot-Server-Patches/0346-Implement-PlayerPostRe...

49 lines
2.0 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2019-03-24 17:50:42 +00: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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 85694a0ad7e32e4a98d8b0589f8d4dca91625bb3..8a659688ddc608fafe19e452c55e69f132f05fca 100644
2019-03-24 17:50:42 +00:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -664,9 +664,14 @@ public abstract class PlayerList {
2020-06-25 14:09:55 +00:00
// this.a(entityplayer1, entityplayer, worldserver1); // CraftBukkit - removed
boolean flag2 = false;
2019-03-24 17:50:42 +00:00
+ // Paper start
+ boolean isBedSpawn = false;
+ boolean isRespawn = false;
+ // Paper end
+
// CraftBukkit start - fire PlayerRespawnEvent
if (location == null) {
- boolean isBedSpawn = false;
2020-06-25 14:09:55 +00:00
+ // boolean isBedSpawn = false; // Paper - moved up
WorldServer worldserver1 = this.server.getWorldServer(entityplayer.getSpawnDimension());
if (worldserver1 != null) {
Optional optional;
@@ -707,6 +712,7 @@ public abstract class PlayerList {
2019-03-24 17:50:42 +00:00
location = respawnEvent.getRespawnLocation();
2019-05-06 02:58:04 +00:00
if (!flag) entityplayer.reset(); // SPIGOT-4785
2019-03-24 17:50:42 +00:00
+ isRespawn = true; // Paper
} else {
2020-06-25 14:09:55 +00:00
location.setWorld(worldserver.getWorld());
2019-03-24 17:50:42 +00:00
}
@@ -764,6 +770,13 @@ public abstract class PlayerList {
2019-03-24 17:50:42 +00: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;
}