aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch')
-rw-r--r--patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch
new file mode 100644
index 0000000000..fb3c8b1818
--- /dev/null
+++ b/patches/server/0865-Sanitize-Sent-BlockEntity-NBT.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <[email protected]>
+Date: Fri, 3 Dec 2021 16:55:50 -0500
+Subject: [PATCH] Sanitize Sent BlockEntity NBT
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+index 12d7cb0eb485987d245454fa2d9fef67ea7e9c76..b1e326cf4f7fe447f81b588dcb0eda9a435e59a8 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java
+@@ -17,7 +17,7 @@ public class ClientboundBlockEntityDataPacket implements Packet<ClientGamePacket
+ private final CompoundTag tag;
+
+ public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity, Function<BlockEntity, CompoundTag> nbtGetter) {
+- return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), nbtGetter.apply(blockEntity));
++ return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity))); // Paper - Sanitize sent data
+ }
+
+ public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) {
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
+index 2b35059cfe7a27238e0a74df058733897a26ac1c..76b6437a1d807c7e1b673f8feeed1f171ee9a803 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
+@@ -183,6 +183,7 @@ public class ClientboundLevelChunkPacketData {
+ CompoundTag compoundTag = blockEntity.getUpdateTag();
+ BlockPos blockPos = blockEntity.getBlockPos();
+ int i = SectionPos.sectionRelative(blockPos.getX()) << 4 | SectionPos.sectionRelative(blockPos.getZ());
++ blockEntity.sanitizeSentNbt(compoundTag); // Paper - Sanitize sent data
+ return new ClientboundLevelChunkPacketData.BlockEntityInfo(i, blockPos.getY(), blockEntity.getType(), compoundTag.isEmpty() ? null : compoundTag);
+ }
+ }
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+index d62181bd8bccfcfdd7da8f635bdf7ebc36294705..b96d57b0bcf21508f8e03e96b7553eb486fdf212 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+@@ -256,4 +256,12 @@ public abstract class BlockEntity {
+ return null;
+ }
+ // CraftBukkit end
++ // Paper start
++ public CompoundTag sanitizeSentNbt(CompoundTag tag) {
++ tag.remove("PublicBukkitValues");
++
++ return tag;
++ }
++ // Paper end
++
+ }