Fix builders requesting items again after already having them availab…

…le. (#10404) Builders will now check items in their inventory for the next bucket. Due to this change the last boolean of the method was always true, making it redundant, and thus removed.
ldtteam · Nov 6, 2024 · e7a4af7 · e7a4af7
1 parent 7c4642e
commit e7a4af7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuildingStructureBuilder.java b/src/main/java/com/minecolonies/core/colony/buildings/AbstractBuildingStructureBuilder.java
@@ -404,11 +404,10 @@ public Map<Integer, List<BlockPos>> getFluidsToRemove()
      *
      * @param requiredResources the bucket to check and request.
      * @param worker            the worker.
-     * @param workerInv         if the worker inv should be checked too.
      */
-    public void checkOrRequestBucket(@Nullable final BuilderBucket requiredResources, final ICitizenData worker, final boolean workerInv)
+    public void checkOrRequestBucket(@Nullable final BuilderBucket requiredResources, final ICitizenData worker)
     {
-        getFirstModuleOccurance(BuildingResourcesModule.class).checkOrRequestBucket(requiredResources, worker, workerInv);
+        getFirstModuleOccurance(BuildingResourcesModule.class).checkOrRequestBucket(requiredResources, worker);
     }
 
     /**

diff --git a/src/main/java/com/minecolonies/core/colony/buildings/modules/BuildingResourcesModule.java b/src/main/java/com/minecolonies/core/colony/buildings/modules/BuildingResourcesModule.java
@@ -327,9 +327,8 @@ public boolean requiresResourceForBuilding(final ItemStack stack)
      *
      * @param requiredResources the bucket to check and request.
      * @param worker            the worker.
-     * @param workerInv         if the worker inv should be checked too.
      */
-    public void checkOrRequestBucket(@Nullable final BuilderBucket requiredResources, final ICitizenData worker, final boolean workerInv)
+    public void checkOrRequestBucket(@Nullable final BuilderBucket requiredResources, final ICitizenData worker)
     {
         if (requiredResources == null)
         {
@@ -353,13 +352,10 @@ public void checkOrRequestBucket(@Nullable final BuilderBucket requiredResources
                 continue;
             }
 
-            if (workerInv)
+            count += InventoryUtils.getItemCountInItemHandler(worker.getInventory(), stack -> ItemStackUtils.compareItemStacksIgnoreStackSize(stack, itemStack.getItemStack()));
+            if (count >= entry.getValue())
             {
-                count += InventoryUtils.getItemCountInItemHandler(worker.getInventory(), stack -> ItemStackUtils.compareItemStacksIgnoreStackSize(stack, itemStack.getItemStack()));
-                if (count >= entry.getValue())
-                {
-                    continue;
-                }
+                continue;
             }
 
             int requestCount = entry.getValue() - count;

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructure.java b/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructure.java
@@ -227,8 +227,8 @@ public IAIState pickUpMaterial()
 
         if (neededItemsList.size() <= pickUpCount || InventoryUtils.openSlotCount(worker.getInventoryCitizen()) <= MIN_OPEN_SLOTS)
         {
-            building.checkOrRequestBucket(building.getRequiredResources(), worker.getCitizenData(), true);
-            building.checkOrRequestBucket(building.getNextBucket(), worker.getCitizenData(), false);
+            building.checkOrRequestBucket(building.getRequiredResources(), worker.getCitizenData());
+            building.checkOrRequestBucket(building.getNextBucket(), worker.getCitizenData());
             pickUpCount = 0;
             return START_WORKING;
         }
@@ -448,7 +448,7 @@ protected IAIState structureStep()
                   placer.executeStructureStep(world, null, progress, StructurePlacer.Operation.BLOCK_REMOVAL, () -> placer.getIterator().decrement(this::skipClearing), false);
                 if (result.getBlockResult().getResult() == BlockPlacementResult.Result.FINISHED)
                 {
-                    building.checkOrRequestBucket(building.getRequiredResources(), worker.getCitizenData(), true);
+                    building.checkOrRequestBucket(building.getRequiredResources(), worker.getCitizenData());
                 }
                 break;
         }