2021-11-24 02:53:24 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 6 May 2020 05:00:57 -0400
|
2024-01-24 11:45:17 +01:00
|
|
|
Subject: [PATCH] Handle Oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
|
|
|
|
Splits out Extra Packets if too many TE's are encountered to prevent
|
|
|
|
creating too large of a packet to sed.
|
|
|
|
|
2024-11-09 21:44:55 +01:00
|
|
|
Feature patch
|
|
|
|
|
2024-01-21 13:56:22 +01:00
|
|
|
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
2021-11-24 02:53:24 +01:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
|
2024-06-15 19:24:11 +02:00
|
|
|
index 1e75cd33c32f0e2923681da64b9b73b279933c1b..0a8d07bf68b0ceabd13c70196d357fce79dcc2c3 100644
|
2021-11-24 02:53:24 +01:00
|
|
|
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
|
2024-04-25 14:23:55 +02:00
|
|
|
@@ -27,6 +27,14 @@ public class ClientboundLevelChunkPacketData {
|
2021-11-24 02:53:24 +01:00
|
|
|
private final CompoundTag heightmaps;
|
|
|
|
private final byte[] buffer;
|
|
|
|
private final List<ClientboundLevelChunkPacketData.BlockEntityInfo> blockEntitiesData;
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper start - Handle oversized block entities in chunks
|
2023-09-24 04:35:16 +02:00
|
|
|
+ private final java.util.List<net.minecraft.network.protocol.Packet<?>> extraPackets = new java.util.ArrayList<>();
|
2021-11-24 02:53:24 +01:00
|
|
|
+ private static final int TE_LIMIT = Integer.getInteger("Paper.excessiveTELimit", 750);
|
|
|
|
+
|
2023-09-24 04:35:16 +02:00
|
|
|
+ public List<net.minecraft.network.protocol.Packet<?>> getExtraPackets() {
|
2021-11-24 02:53:24 +01:00
|
|
|
+ return this.extraPackets;
|
|
|
|
+ }
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper end - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
|
2024-01-23 18:01:39 +01:00
|
|
|
// Paper start - Anti-Xray - Add chunk packet info
|
|
|
|
@Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkPacketData(LevelChunk chunk) { this(chunk, null); }
|
2024-04-25 14:23:55 +02:00
|
|
|
@@ -50,8 +58,18 @@ public class ClientboundLevelChunkPacketData {
|
2024-01-23 18:01:39 +01:00
|
|
|
extractChunkData(new FriendlyByteBuf(this.getWriteBuffer()), chunk, chunkPacketInfo);
|
|
|
|
// Paper end
|
2021-11-24 02:53:24 +01:00
|
|
|
this.blockEntitiesData = Lists.newArrayList();
|
2024-01-21 13:56:22 +01:00
|
|
|
+ int totalTileEntities = 0; // Paper - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
|
2024-04-12 21:14:06 +02:00
|
|
|
for (Entry<BlockPos, BlockEntity> entry2 : chunk.getBlockEntities().entrySet()) {
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper start - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
+ if (++totalTileEntities > TE_LIMIT) {
|
|
|
|
+ var packet = entry2.getValue().getUpdatePacket();
|
|
|
|
+ if (packet != null) {
|
|
|
|
+ this.extraPackets.add(packet);
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper end - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
this.blockEntitiesData.add(ClientboundLevelChunkPacketData.BlockEntityInfo.create(entry2.getValue()));
|
|
|
|
}
|
2024-04-12 21:14:06 +02:00
|
|
|
}
|
2021-11-24 02:53:24 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
|
2024-04-25 14:23:55 +02:00
|
|
|
index 8ead66c134688b11dca15f6509147e726f182e6a..cfcac0fdc130120cb1f8d97c6353d93db7ddf81b 100644
|
2021-11-24 02:53:24 +01:00
|
|
|
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
|
|
|
|
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
|
2024-04-25 14:23:55 +02:00
|
|
|
@@ -83,4 +83,11 @@ public class ClientboundLevelChunkWithLightPacket implements Packet<ClientGamePa
|
2021-11-24 02:53:24 +01:00
|
|
|
public ClientboundLightUpdatePacketData getLightData() {
|
|
|
|
return this.lightData;
|
|
|
|
}
|
|
|
|
+
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper start - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
+ @Override
|
2023-09-24 04:35:16 +02:00
|
|
|
+ public java.util.List<Packet<?>> getExtraPackets() {
|
2021-11-24 02:53:24 +01:00
|
|
|
+ return this.chunkData.getExtraPackets();
|
|
|
|
+ }
|
2024-01-21 13:56:22 +01:00
|
|
|
+ // Paper end - Handle oversized block entities in chunks
|
2021-11-24 02:53:24 +01:00
|
|
|
}
|