49 Zeilen
2.0 KiB
Diff
49 Zeilen
2.0 KiB
Diff
|
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] Implement PlayerPostRespawnEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index 4d813b6556030354f51c1ee5f18eac2166b44576..7412765020854caabd32fb6f4fffcf7f4bf6dba7 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -737,9 +737,14 @@ public abstract class PlayerList {
|
||
|
|
// this.a(entityplayer1, entityplayer, worldserver1); // CraftBukkit - removed
|
||
|
|
boolean flag2 = false;
|
||
|
|
|
||
|
|
+ // 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
|
||
|
|
ServerLevel worldserver1 = this.server.getLevel(entityplayer.getRespawnDimension());
|
||
|
|
if (worldserver1 != null) {
|
||
|
|
Optional optional;
|
||
|
|
@@ -790,6 +795,7 @@ public abstract class PlayerList {
|
||
|
|
|
||
|
|
location = respawnEvent.getRespawnLocation();
|
||
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
||
|
|
+ isRespawn = true; // Paper
|
||
|
|
} else {
|
||
|
|
location.setWorld(worldserver.getWorld());
|
||
|
|
}
|
||
|
|
@@ -847,6 +853,13 @@ public abstract class PlayerList {
|
||
|
|
if (entityplayer.connection.isDisconnected()) {
|
||
|
|
this.save(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;
|
||
|
|
}
|