Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)
PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
BillyGalbreath
2022-09-10 04:46:02 -05:00
parent 5f14c32a66
commit 664774af5a
16 changed files with 43 additions and 43 deletions

View File

@@ -17,10 +17,10 @@ index 3615576c24d5d6790a6894a91180de25fa0e5a9c..266a26d73dd5aec427b64a638693decf
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 3d4e0be647f48a33d1afcdbec62c6624f2086294..5d8f2eedb1c2acc82e61a4adc3c688802e2d25a7 100644
index d3dd458dc1d3eb7f426565e38d63bb26c48cec4b..ec77de694db65e3d67cc719fb160af2ecedb8678 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3647,6 +3647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3641,6 +3641,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index 3d4e0be647f48a33d1afcdbec62c6624f2086294..5d8f2eedb1c2acc82e61a4adc3c68880
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3671,6 +3672,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3665,6 +3666,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}