From 5973490154cc00be98f5a87520e457f3a1d5483e Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Sun, 29 Dec 2024 01:36:58 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fixed=20storage=20gui=20t?= =?UTF-8?q?o=20close=20if=20something=20has=20messed=20with=20number=20of?= =?UTF-8?q?=20slots=20in=20the=20storage=20like=20in=20case=20of=20double?= =?UTF-8?q?=20chest=20when=20creeper=20explodes=20half=20of=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../common/gui/StorageContainerMenuBase.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index d92892e7..d670cbb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=false mod_id=sophisticatedcore mod_group_id=sophisticatedcore -mod_version=1.0.1 +mod_version=1.0.2 sonar_project_key=sophisticatedcore:SophisticatedCore github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedCore diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java b/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java index d8cbe674..672ed4f6 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java @@ -295,10 +295,8 @@ public boolean mayPickup(Player playerIn) { return addSlot(slot); } - public void closeScreenIfSomethingMessedWithStorageItemStack() { - if (!isClientSide() && storageItemHasChanged()) { - player.closeContainer(); - } + public boolean hasSomethingMessedWithStorage() { + return !isClientSide() && (storageItemHasChanged() || realInventorySlots.size() != storageWrapper.getInventoryHandler().getSlots() + NUMBER_OF_PLAYER_SLOTS); } protected boolean isClientSide() { @@ -1459,7 +1457,10 @@ public void setItem(int slotId, int pStateId, ItemStack pStack) { @Override public void broadcastChanges() { - closeScreenIfSomethingMessedWithStorageItemStack(); + if (hasSomethingMessedWithStorage()) { + player.closeContainer(); + return; + } synchronizeCarriedToRemote(); broadcastChangesIn(lastUpgradeSlots, remoteUpgradeSlots, upgradeSlots, getFirstUpgradeSlot());