Ticket #4131: ticket4131.patch

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

@@ -3381 +3381 @@
             this.Stop(false);
         }
 
+        this.workOrders = [];
+        let cmpTrader = Engine.QueryInterface(this.entity, IID_Trader);
+        if (cmpTrader)
+            cmpTrader.StopTrading();
+
         this.SetStance(this.template.DefaultStance);
         if (this.IsTurret())
             this.SetTurretStance();
@@ -5219 +5224 @@
 
 UnitAI.prototype.SwitchMarketOrder = function(oldMarket, newMarket)
 {
-    if (this.order.data && this.order.data.target && this.order.data.target == oldMarket)
+    if (this.order && this.order.data && this.order.data.target && this.order.data.target == oldMarket)
         this.order.data.target = newMarket;
 };
 
@@ -5227 +5232 @@
 {
     if (this.waypoints && this.waypoints.length > 1)
     {
-        var point = this.waypoints.pop();
-        var ok = this.MoveToPoint(point.x, point.z);
-        if (!ok)
-            ok = this.MoveToMarket(targetMarket);
+        let point = this.waypoints.pop();
+        if (this.MoveToPoint(point.x, point.z))
+            return true;
+        return this.MoveToMarket(targetMarket);
     }
-    else
-    {
-        this.waypoints = undefined;
-        var ok = this.MoveToTarget(targetMarket);
-    }
 
-    return ok;
+    this.waypoints = undefined;
+    return this.MoveToTarget(targetMarket);
 };
 
 UnitAI.prototype.PerformTradeAndMoveToNextMarket = function(currentMarket)