Ticket #3430: ticket3430.patch

binaries/data/mods/public/simulation/components/UnitAI.js

@@ -2340 +2340 @@
 
                     // If hunting, try to go to the initial herd position to see if we are more lucky
                     if (herdPos)
+                    {
                         this.GatherNearPosition(herdPos.x, herdPos.z, resourceType, resourceTemplate);
+                        return;
+                    }
 
                     // Nothing else to gather - if we're carrying anything then we should
                     // drop it off, and if not then we might as well head to the dropsite
@@ -3530 +3533 @@
     }
     else
     {
-        this.SetNextState("IDLE");
+        // We must switch to the idle state immediately (and not do a simple SetNextState)
+        // otherwise we may be in a weird state if a ProcessMessage is triggered (by a MoveStarted
+        // or MoveCompleted) when starting a new order and before we have set our new state.
+        let index = this.GetCurrentState().indexOf(".");
+        if (index != -1)
+            this.UnitFsm.SwitchToNextState(this, this.GetCurrentState().slice(0,index+1) + "IDLE");
+        else
+            this.SetNextState("IDLE");  // should never happen
 
         Engine.PostMessage(this.entity, MT_UnitAIOrderDataChanged, { "to": this.GetOrderData() });