0708fa363b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: eb2e6578 SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance 989f9b3d SPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate events f554183c SPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving 2349feb8 SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
51 lines
2 KiB
Diff
51 lines
2 KiB
Diff
From 05256c22933dd74cce5a27ac0b3ad4dc0b566167 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 abddc8895..a183bb450 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -637,9 +637,14 @@ public abstract class PlayerList {
|
|
|
|
// 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) {
|
|
Optional<Vec3D> optional = EntityHuman.getBed(cworld.getHandle(), blockposition, flag1);
|
|
@@ -672,6 +677,7 @@ public abstract class PlayerList {
|
|
|
|
location = respawnEvent.getRespawnLocation();
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
|
+ isRespawn = true; // Paper
|
|
} else {
|
|
location.setWorld(server.getWorldServer(dimensionmanager).getWorld());
|
|
}
|
|
@@ -733,6 +739,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.22.0
|
|
|