close shop screens when the BE disappears for any reason

wisp-forest · Feb 16, 2024 · 1024bb6 · 1024bb6
1 parent be8a672
commit 1024bb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
     loader_version=0.15.3
 
 # Mod Properties
-    mod_version=0.2.13
+    mod_version=0.2.14
     maven_group=com.glisco
     archives_base_name=numismatic-overhaul
 

diff --git a/src/main/java/com/glisco/numismaticoverhaul/block/ShopBlockEntity.java b/src/main/java/com/glisco/numismaticoverhaul/block/ShopBlockEntity.java
@@ -192,7 +192,7 @@ protected ScreenHandler createScreenHandler(int syncId, PlayerInventory playerIn
 
     @Override
     public boolean canPlayerUse(PlayerEntity player) {
-        return player.getUuid().equals(this.owner) && this.pos.getSquaredDistance(player.getX(), player.getY(), player.getZ()) <= 100;
+        return player.getUuid().equals(this.owner) && this.world.getBlockEntity(this.pos) == this && this.pos.getSquaredDistance(player.getX(), player.getY(), player.getZ()) <= 100;
     }
 
     @Override

diff --git a/src/main/java/com/glisco/numismaticoverhaul/mixin/MerchantScreenHandlerMixin.java b/src/main/java/com/glisco/numismaticoverhaul/mixin/MerchantScreenHandlerMixin.java
@@ -94,7 +94,8 @@ public void checkForEntityOnYes(CallbackInfo ci) {
     public void thwartTaxEvasion(PlayerEntity player, CallbackInfoReturnable<Boolean> cir) {
         if (!(this.merchant instanceof ShopMerchant shopMerchant)) return;
 
-        if (shopMerchant.shop().getPos().getSquaredDistance(player.getX(), player.getY(), player.getZ()) > 100) {
+        var shop = shopMerchant.shop();
+        if (shop.getWorld().getBlockEntity(shop.getPos()) != shop || shop.getPos().getSquaredDistance(player.getX(), player.getY(), player.getZ()) > 100) {
             cir.setReturnValue(false);
         }
     }