2020-05-06 09:48:49 +00:00
|
|
|
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
|
2020-06-26 12:04:38 +00:00
|
|
|
index 5f520d8a7ad4753bc106ebf9567fbbb8a36ac1d1..5b3d2bd35ca3f98b8c04ea841023d68b24b91718 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
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -665,9 +665,14 @@ public abstract class PlayerList {
|
|
|
|
// 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;
|
|
|
|
@@ -708,6 +713,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
|
|
|
}
|
2020-06-25 14:09:55 +00:00
|
|
|
@@ -765,6 +771,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;
|
|
|
|
}
|