Ticket #3430: ticket3430-v2.patch

binaries/data/mods/public/simulation/ai/common-api/entity.js

@@ -721 +721 @@
                 res = this._ai._entities.get(this.unitAIOrderData()[0]["target"]);
             else if (this.unitAIOrderData()[1] !== undefined && this.unitAIOrderData()[1]["target"] !== undefined)
                 res = this._ai._entities.get(this.unitAIOrderData()[1]["target"]);
-            if (res === undefined)
-                return undefined;
+            if (!res)
+                return 0;
+            let type = res.resourceSupplyType();
+            if (!type)
+                return 0;
 
-            let type = res.resourceSupplyType();
             if (type.generic === "treasure")
                 return 1000;
 

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

@@ -2036 +2036 @@
                             // It's probably better in this case, to avoid units getting stuck around a dropsite
                             // in a "Target is far away, full, nearby are no good resources, return to dropsite" loop
                             // to order it to GatherNear the resource position.
-                            var cmpPosition = Engine.QueryInterface(this.gatheringTarget, IID_Position);
+                            var cmpPosition = Engine.QueryInterface(oldTarget, IID_Position);
                             if (cmpPosition)
                             {
                                 var pos = cmpPosition.GetPosition();
                                 this.GatherNearPosition(pos.x, pos.z, oldType, oldTemplate);
                                 return true;
-                            } else {
+                            }
+                            else
+                            {
                                 // we're kind of stuck here. Return resource.
                                 var nearby = this.FindNearestDropsite(oldType.generic);
                                 if (nearby)
@@ -2340 +2342 @@
 
                     // 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 +3535 @@
     }
     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() });