Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
33d4f608b fix stupid legacy chat garbage
a1eebfea9 fix #5212 and #5213

Tuinity Changes:
2f298d30e Fix getEntities for ender dragon parts
This commit is contained in:
jmp
2021-02-22 01:45:48 -08:00
parent 14906a1666
commit 83695886bc
16 changed files with 28 additions and 30 deletions

View File

@@ -37,10 +37,10 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
this.isRestarting = isRestarting;
if (flag) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 381595db593fdddb195a07d1352ff514ac281c43..e765d0c7ea5ee030ac718ebd7572e1a6719aa84c 100644
index 47f916a7fc2581720b628ffa6c720af2e459fd92..8f60273865d9f49420e25da71edc61175896fc62 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -516,6 +516,8 @@ public abstract class PlayerList {
@@ -517,6 +517,8 @@ public abstract class PlayerList {
if (entityplayer.didPlayerJoinEvent) cserver.getPluginManager().callEvent(playerQuitEvent); // Paper - if we disconnected before join ever fired, don't fire quit
entityplayer.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());