Ticket #2206: correct_backtowork.diff

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

@@ -499 +499 @@
     },
 
     "Order.Gather": function(msg) {
+        // This is a work to remember
+        this.lastWorkOrder = this.order;
+        
         // If the target is still alive, we need to kill it first
         if (this.MustKillGatherTarget(this.order.data.target))
         {
@@ -554 +557 @@
     },
 
     "Order.ReturnResource": function(msg) {
+        // This is a work to remember
+        this.lastWorkOrder = this.order;
+        
         // Try to move to the dropsite
         if (this.MoveToTarget(this.order.data.target))
         {
@@ -573 +579 @@
     },
 
     "Order.Trade": function(msg) {
+        // This is a work to remember
+        this.lastWorkOrder = this.order;
+        
         if (this.MoveToMarket(this.order.data.firstMarket))
         {
             // We've started walking to the first market
@@ -581 +590 @@
     },
 
     "Order.Repair": function(msg) {
+        // This is a work to remember
+        this.lastWorkOrder = this.order;
+        
         // Try to move within range
         if (this.MoveToTargetRange(this.order.data.target, IID_Builder))
         {
@@ -2892 +2904 @@
 {
     var order = { "type": type, "data": data };
     this.orderQueue.push(order);
-    
-    if(type == "Gather" || type == "Trade" || type == "Repair" || type == "ReturnResource")
-        this.lastWorkOrder = order;
 
     // If we didn't already have an order, then process this new one
     if (this.orderQueue.length == 1)