Fieldpolygon might be nil for fieldwork, so regenerate it from the co…

…urse.
Courseplay · Dec 10, 2023 · 0191504 · 0191504
1 parent 9889590
commit 0191504
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/scripts/ai/AIDriveStrategyFieldWorkCourse.lua b/scripts/ai/AIDriveStrategyFieldWorkCourse.lua
@@ -656,6 +656,10 @@ end
 
 function AIDriveStrategyFieldWorkCourse:setFieldPolygon(polygon)
     self.fieldPolygon = polygon    
+    if self.fieldPolygon == nil then 
+        self:debug("No field polygon received, so regenerate it by the course.")
+        self.fieldPolygon = self.fieldWorkCourse:getFieldPolygon()
+    end
 end
 
 -----------------------------------------------------------------------------------------------------------------------

diff --git a/scripts/ai/jobs/CpAIJobFieldWork.lua b/scripts/ai/jobs/CpAIJobFieldWork.lua
@@ -82,14 +82,14 @@ function CpAIJobFieldWork:validateFieldSetup(isValid, errorMessage)
     self.hasValidPosition = false
     self.foundVines = nil
     local fieldPolygon, isCustomField = CpFieldUtil.getFieldPolygonAtWorldPosition(tx, tz)
+    self:setFieldPolygon(fieldPolygon)
     if fieldPolygon then
         self.hasValidPosition = true
         self.foundVines = g_vineScanner:findVineNodesInField(fieldPolygon, tx, tz, self.customField ~= nil)
         if self.foundVines then
             CpUtil.debugVehicle(CpDebug.DBG_FIELDWORK, vehicle, "Found vine nodes, generating a vine field border.")
             fieldPolygon = g_vineScanner:getCourseGeneratorVertices(0, tx, tz)
         end
-        self:setFieldPolygon(fieldPolygon)
         self.selectedFieldPlot:setWaypoints(fieldPolygon)
         self.selectedFieldPlot:setVisible(true)
         self.selectedFieldPlot:setBrightColor(true)