fix #10490 (#10502)

Mark min stock requests as passive to avoid interfering with worker operation. Fix food request equality
ldtteam · Dec 4, 2024 · f2b2311 · f2b2311
1 parent a8346fd
commit f2b2311
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/minecolonies/core/colony/buildings/modules/MinimumStockModule.java b/src/main/java/com/minecolonies/core/colony/buildings/modules/MinimumStockModule.java
@@ -132,7 +132,7 @@ public void onColonyTick(@NotNull final IColony colony)
                         itemStack.setCount(Math.min(itemStack.getMaxStackSize(), delta));
                         final MinimumStack stack = new MinimumStack(itemStack, false);
                         stack.setCanBeResolvedByBuilding(false);
-                        building.createRequest(stack, false);
+                        building.createRequest(stack, true);
                     }
                 }
                 else if (request != null && delta <= 0)

diff --git a/src/main/java/com/minecolonies/core/colony/buildings/modules/RestaurantMenuModule.java b/src/main/java/com/minecolonies/core/colony/buildings/modules/RestaurantMenuModule.java
@@ -144,7 +144,7 @@ public void onColonyTick(@NotNull final IColony colony)
                         requestStack.setCount(Math.min(16, Math.min(requestStack.getMaxStackSize(), delta)));
                         final MinimumStack stack = new MinimumStack(requestStack, false);
                         stack.setCanBeResolvedByBuilding(false);
-                        building.createRequest(stack, false);
+                        building.createRequest(stack, true);
                     }
                 }
                 else if (request != null && delta <= 0)

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/production/EntityAIWorkNether.java b/src/main/java/com/minecolonies/core/entity/ai/workers/production/EntityAIWorkNether.java
@@ -985,7 +985,7 @@ protected void checkAndRequestArmor()
 
     protected IAIState checkAndRequestFood()
     {
-        if (InventoryUtils.getItemCountInItemHandler(worker.getInventoryCitizen(), stack -> building.getModule(NETHERMINER_MENU).getMenu().contains(new ItemStorage(stack))) > 16)
+        if (InventoryUtils.getItemCountInItemHandler(worker.getInventoryCitizen(), stack -> building.getModule(NETHERMINER_MENU).getMenu().contains(new ItemStorage(stack))) >= 16)
         {
             // We have enough food.
             return getState();