mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
a0b8b886c8
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:
d5a72960
SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
48 lines
2 KiB
Diff
48 lines
2 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index fbed3c1012c5b6fe61598ae6fae64edc2ad2e490..e6b7f1d0e864b32dd670547609c103cf7b6831c5 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -665,9 +665,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
|
|
WorldServer worldserver1 = this.server.getWorldServer(entityplayer.getSpawnDimension());
|
|
if (worldserver1 != null) {
|
|
Optional optional;
|
|
@@ -718,6 +723,7 @@ public abstract class PlayerList {
|
|
|
|
location = respawnEvent.getRespawnLocation();
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
|
+ isRespawn = true; // Paper
|
|
} else {
|
|
location.setWorld(worldserver.getWorld());
|
|
}
|
|
@@ -775,6 +781,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;
|
|
}
|