Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b72eafc Send block entities after destroy prediction (#8053)
PaperMC/Paper@b74c4d4 Warn on plugins accessing faraway chunks (#8208)
PaperMC/Paper@65f0b2e Add more needed BlockStateListPopulator Methods (#8021)
This commit is contained in:
BillyGalbreath
2022-07-30 08:03:52 -05:00
parent 723e3703b2
commit 513f3bbedf
17 changed files with 42 additions and 42 deletions

View File

@@ -17,10 +17,10 @@ index 94944ba458178f9e5b772224da329bb5d85f4394..94d87f6bd2c27b0d6cc4547e8bc6e87b
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 86c91ba9ddf1042f832c7a7379533040624fff44..1cb441e7f909dc15fb1fa3cf83657549dd8b6605 100644
index 32ef30e130c7f6e252ebf5b866fb9e89d7c0d7db..2c9ab0cd801b6c95c9263960a7234a5e30de9672 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3594,6 +3594,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3614,6 +3614,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 86c91ba9ddf1042f832c7a7379533040624fff44..1cb441e7f909dc15fb1fa3cf83657549
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3618,6 +3619,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3638,6 +3639,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
}