Merge pull request #3192 from Courseplay/Issue-3181

Only check for valid filltype while driving to the unloading point
Courseplay · Apr 10, 2024 · 1d42f61 · 1d42f61
2 parents 5b20f7a + df3825b
commit 1d42f61
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/scripts/ai/jobs/CpAIJobCombineUnloader.lua b/scripts/ai/jobs/CpAIJobCombineUnloader.lua
@@ -313,15 +313,17 @@ function CpAIJobCombineUnloader:canContinueWork()
 		if not canContinue then 
 			return canContinue, errorMessage
 		end
-		local hasSupportedFillTypeLoaded = false
-		for _, dischargeNodeInfo in ipairs(self.dischargeNodeInfos) do
-			local fillType = dischargeNodeInfo.vehicle:getFillUnitFillType(dischargeNodeInfo.dischargeNode.fillUnitIndex)
-			if self.supportedFillTypes[fillType] then 
-				hasSupportedFillTypeLoaded = true
+		if self.currentTaskIndex == self.driveToUnloadingTask.taskIndex then
+			local hasSupportedFillTypeLoaded = false
+			for _, dischargeNodeInfo in ipairs(self.dischargeNodeInfos) do
+				local fillType = dischargeNodeInfo.vehicle:getFillUnitFillType(dischargeNodeInfo.dischargeNode.fillUnitIndex)
+				if self.supportedFillTypes[fillType] then 
+					hasSupportedFillTypeLoaded = true
+				end
+			end
+			if not hasSupportedFillTypeLoaded then
+				return false, AIMessageErrorNoValidFillTypeLoaded.new()
 			end
-		end
-		if not hasSupportedFillTypeLoaded then
-			return false, AIMessageErrorNoValidFillTypeLoaded.new()
 		end
 	end