🐛 Fixed quarry screen staying open, even when the block is destroyed …

…or too far away.
RXJpaw · Jul 7, 2024 · 282e030 · 282e030
1 parent 0a8a733
commit 282e030
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/pw/rxj/iron_quarry/blockentity/QuarryBlockEntity.java b/src/main/java/pw/rxj/iron_quarry/blockentity/QuarryBlockEntity.java
@@ -84,6 +84,14 @@ public QuarryBlock getQuarryBlock(){
         }
     }
 
+    public boolean canPlayerUse(PlayerEntity player) {
+        if (this.world != null && this.world.getBlockEntity(this.pos) != this) {
+            return false;
+        } else {
+            return player.squaredDistanceTo((double)this.pos.getX() + 0.5, (double)this.pos.getY() + 0.5, (double)this.pos.getZ() + 0.5) <= 64.0;
+        }
+    }
+
     @Override
     public void markRemoved() {
         if(world == null) return;

diff --git a/src/main/java/pw/rxj/iron_quarry/util/QuarryInventory.java b/src/main/java/pw/rxj/iron_quarry/util/QuarryInventory.java
@@ -1,6 +1,7 @@
 package pw.rxj.iron_quarry.util;
 
 import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
 import pw.rxj.iron_quarry.blockentity.QuarryBlockEntity;
@@ -23,6 +24,13 @@ private ReferencedQuarryInventory(int size, @Nullable QuarryBlockEntity ref) {
             return this.ref;
         }
 
+        @Override
+        public boolean canPlayerUse(PlayerEntity player) {
+            QuarryBlockEntity quarryBlockEntity = this.ref();
+
+            return quarryBlockEntity != null && quarryBlockEntity.canPlayerUse(player);
+        }
+
         @Override
         public void markDirty() {
             if(ref == null) return;