From 1db95f669438e4fc1410dcc8c81ff8d18c12b19b Mon Sep 17 00:00:00 2001 From: Luna <90072930+LunaWasFlaggedAgain@users.noreply.github.com> Date: Tue, 12 Jul 2022 02:55:01 -0300 Subject: [PATCH] Validate block entity tag query positions (#44) --- ...ate-block-entity-tag-query-positions.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 patches/server/0037-Validate-block-entity-tag-query-positions.patch diff --git a/patches/server/0037-Validate-block-entity-tag-query-positions.patch b/patches/server/0037-Validate-block-entity-tag-query-positions.patch new file mode 100644 index 0000000..8ab4a53 --- /dev/null +++ b/patches/server/0037-Validate-block-entity-tag-query-positions.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luna +Date: Mon, 11 Jul 2022 17:29:12 -0300 +Subject: [PATCH] Validate block entity tag query positions + + +diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index 5a8d4421c2de0680a3f4880451badcf5c4b46597..70b8e04d1b3081381956eaa969cbfbc6c91e1f45 100644 +--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +@@ -1303,7 +1303,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser + @Override + public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { + PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); +- if (this.player.hasPermissions(2)) { ++ if (this.player.hasPermissions(2) && Level.isInSpawnableBounds(packet.getPos())) { // Scissors - Validate block entity tag query positions + BlockEntity tileentity = this.player.getLevel().getBlockEntity(packet.getPos()); + CompoundTag nbttagcompound = tileentity != null ? tileentity.saveWithoutMetadata() : null; +