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

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7b232293803f19bcfd4a8201a06bfdaa7fb08093..1c88b914dac85cf1d5cf1733cb9f8d5f0407a986 100644
index b6c5d6476db96e3eba5f6c2468c2dce8f2b42730..94050662ad3d74ec9f7c313a3ef075ec1670e961 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1472,6 +1472,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 7b232293803f19bcfd4a8201a06bfdaa7fb08093..1c88b914dac85cf1d5cf1733cb9f8d5f
return this.O == tag;
}
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index d99cecc4075338d7b8f154ab94d8ac04190ba371..ec37d2c3b0393c43097bdfc6064ebe3ab8bc28ce 100644
index d99cecc4075338d7b8f154ab94d8ac04190ba371..f4ba0dc132da65eb4d3f7e768eab2d73094d7b37 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -23,6 +23,9 @@ public class EntityItem extends Entity {
@@ -66,7 +66,7 @@ index d99cecc4075338d7b8f154ab94d8ac04190ba371..ec37d2c3b0393c43097bdfc6064ebe3a
+ public void respawnOnClient() {
+ Packet<?> spawnPacket = new PacketPlayOutSpawnEntity(this);
+ Packet<?> metadataPacket = new PacketPlayOutEntityMetadata(getId(), getDataWatcher(), true);
+ for (EntityPlayer entityplayer : getTracker().trackerEntry.trackedPlayers) {
+ for (EntityPlayer entityplayer : this.tracker.trackerEntry.trackedPlayers) {
+ entityplayer.playerConnection.sendPacket(spawnPacket);
+ entityplayer.playerConnection.sendPacket(metadataPacket);
+ }