From 671bf4bd1872e94de219c6e7497603d2c0468c19 Mon Sep 17 00:00:00 2001
From: Luna <90072930+LunaWasFlaggedAgain@users.noreply.github.com>
Date: Fri, 30 Jun 2023 14:43:00 -0300
Subject: [PATCH] Backport blockentitytagquery crash fix to 1.17.1 (#111)

* Backport blockentitytagquery crash fix to 1.17.1

* Test
---
 ...2-Validate-block-entity-tag-query-positions.patch | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/patches/server/0042-Validate-block-entity-tag-query-positions.patch b/patches/server/0042-Validate-block-entity-tag-query-positions.patch
index 9125215..f9f3a6e 100644
--- a/patches/server/0042-Validate-block-entity-tag-query-positions.patch
+++ b/patches/server/0042-Validate-block-entity-tag-query-positions.patch
@@ -5,15 +5,19 @@ 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 a102586b42ac408a3f655f7c0d069ab0990ec7fc..dbf982c85ff361184a34b462bec331ac5b1a472c 100644
+index a102586b42ac408a3f655f7c0d069ab0990ec7fc..3e6160650a2e22f9d4232d4656a176007b5bea9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1252,7 +1252,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1252,8 +1252,10 @@ 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());
+-            BlockEntity tileentity = this.player.getLevel().getBlockEntity(packet.getPos());
++        // Scissors start - Validate block entity tag query positions
++        if (this.player.hasPermissions(2) && Level.isInSpawnableBounds(packet.getPos())) {
++            BlockEntity tileentity = this.player.getLevel().isLoaded(packet.getPos()) ? this.player.getLevel().getBlockEntity(packet.getPos()) : null;
++            // Scissors end
              CompoundTag nbttagcompound = tileentity != null ? tileentity.save(new CompoundTag()) : null;
  
+             this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound));