2019-12-16 03:58:10 +01:00
|
|
|
From 9f24ddc1ec8cb2eaeeb6198b94cd83c60989c813 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-12-16 03:58:10 +01:00
|
|
|
index 49437f2124..68e089a4b6 100644
|
2019-03-24 18:50:42 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2019-12-12 17:20:43 +01:00
|
|
|
@@ -638,9 +638,14 @@ public abstract class PlayerList {
|
2019-05-05 19:19:34 +02:00
|
|
|
|
2019-03-24 18:50:42 +01:00
|
|
|
// this.a(entityplayer1, entityplayer, worldserver); // CraftBukkit - removed
|
|
|
|
|
|
|
|
+ // 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) {
|
2019-05-05 19:19:34 +02:00
|
|
|
Optional<Vec3D> optional = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
|
2019-12-12 17:20:43 +01:00
|
|
|
@@ -673,6 +678,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 {
|
|
|
|
location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
|
|
|
|
}
|
2019-12-12 17:20:43 +01:00
|
|
|
@@ -734,6 +740,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;
|
|
|
|
}
|
|
|
|
--
|
2019-12-12 17:20:43 +01:00
|
|
|
2.24.1
|
2019-03-24 18:50:42 +01:00
|
|
|
|