This commit is contained in:
Ben Kerllenevich
2022-06-08 18:16:01 -04:00
parent 05f64e0084
commit 9ab5b07c78
7 changed files with 17 additions and 17 deletions

View File

@@ -17,10 +17,10 @@ index 49a2a99bc0aaedb27524c64db5ce3907bf55cc28..062a06dbff672235acc87624f1b7c28f
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 b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba42f5870fd 100644
index 0c18cc24baf155aac072cfd0ea871d600e0550cb..0f41f7207ab38ed353800cb8cd621e9a93bbbea0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3366,6 +3366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3371,6 +3371,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
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 b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba4
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3390,6 +3391,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3395,6 +3396,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
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
}
@@ -43,7 +43,7 @@ index b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba4
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 01ac24f0999c9829bffeb76c228779f80a571687..331d9b64fd3e005c8b95fe3c926f3691392a05dc 100644
index 9bda669683a3062f99e798ea0a60d76373d46f4f..d87d521adbbc1c211f04bee0be15715948bde652 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2768,4 +2768,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {