Search options screen: don't hold on to item search screen instance

Also, allow search item to be updated even if search upgrade isn't currently switched on
TeamPneumatic · Aug 20, 2024 · df6142e · df6142e
1 parent 69c6df6
commit df6142e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/me/desht/pneumaticcraft/client/gui/pneumatic_armor/options/SearchOptions.java b/src/main/java/me/desht/pneumaticcraft/client/gui/pneumatic_armor/options/SearchOptions.java
@@ -60,6 +60,7 @@ public void populateGui(IGuiScreen gui) {
                 PneumaticArmorItem.setSearchedItem(helmetStack, newSearchedItem);
                 NetworkHandler.sendToServer(new PacketUpdateSearchItem(newSearchedItem));
             }
+            searchGui = null;
         }
     }
 

diff --git a/src/main/java/me/desht/pneumaticcraft/common/network/PacketUpdateSearchItem.java b/src/main/java/me/desht/pneumaticcraft/common/network/PacketUpdateSearchItem.java
@@ -53,7 +53,7 @@ public Type<PacketUpdateSearchItem> type() {
     public static void handle(PacketUpdateSearchItem message, IPayloadContext ctx) {
         if (message.item() != null && message.item() != Items.AIR) {
             CommonArmorHandler handler = CommonArmorHandler.getHandlerForPlayer(ctx.player());
-            if (handler.upgradeUsable(CommonUpgradeHandlers.searchHandler, true)) {
+            if (handler.upgradeUsable(CommonUpgradeHandlers.searchHandler, false)) {
                 ItemStack helmetStack = handler.getPlayer().getItemBySlot(EquipmentSlot.HEAD);
                 if (helmetStack.getItem() instanceof PneumaticArmorItem) {  // should be, but let's be paranoid...
                     PneumaticArmorItem.setSearchedItem(helmetStack, message.item());