Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5d779a621 Implements PlayerHandshakeEvent#getOriginalSocketAddressHostname and deprecates PlayerHandshakeEvent(String, boolean) in favour of PlayerHandshakeEvent(String, String, boolean)
6fab1ee3a Expose Tracked Players
b53a650a5 Clear SyncLoadInfo
c02c22fde fix: legacy component serialisation was wiped out
2dd5dccf0 Add config option for displayname in quit message (#5260)
This commit is contained in:
jmp
2021-02-27 16:51:36 -08:00
parent 529c260911
commit a5fa03865d
27 changed files with 44 additions and 53 deletions

View File

@@ -263,10 +263,10 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8a6340c1eeda638e70d3da6ad30e51b98fd66947..8141ab9c95bf14135022fb72252ee2e74cca87bd 100644
index 0a7777f97b85842aa7f214479dcc7a9e6a4bee8a..3c177abe4ff7e885822dca23684df741021c3941 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2440,4 +2440,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2456,4 +2456,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end