52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
|
From c02e172560f6518901f1bec9105493329b0938af Mon Sep 17 00:00:00 2001
|
||
|
|
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 b1630137e..fbabe5fdf 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||
|
|
@@ -663,9 +663,14 @@ public abstract class PlayerList {
|
||
|
|
// this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
|
||
|
|
BlockPosition blockposition1;
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ boolean isBedSpawn = false;
|
||
|
|
+ boolean isRespawn = false;
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
// CraftBukkit start - fire PlayerRespawnEvent
|
||
|
|
if (location == null) {
|
||
|
|
- boolean isBedSpawn = false;
|
||
|
|
+ //boolean isBedSpawn = false; Paper - moved up
|
||
|
|
CraftWorld cworld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
|
||
|
|
if (cworld != null && blockposition != null) {
|
||
|
|
blockposition1 = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
|
||
|
|
@@ -695,6 +700,7 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
location = respawnEvent.getRespawnLocation();
|
||
|
|
entityplayer.reset();
|
||
|
|
+ isRespawn = true; // Paper
|
||
|
|
} else {
|
||
|
|
location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
|
||
|
|
}
|
||
|
|
@@ -757,6 +763,13 @@ public abstract class PlayerList {
|
||
|
|
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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|