Ticket #1999: destroy.diff

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

@@ -2564 +2564 @@
 
 UnitAI.prototype.OnDestroy = function()
 {
-    // Clean up any timers that are now obsolete
-    this.StopTimer();
-
-    // clear up the ResourceSupply gatherer count.
-    if (this.gatheringTarget)
-    {
-        var cmpSupply = Engine.QueryInterface(this.gatheringTarget, IID_ResourceSupply);
-        if (cmpSupply)
-            cmpSupply.RemoveGatherer(this.entity);
-        delete this.gatheringTarget;
-    }
+    // Go to an "empty" state to properly close the present state (e.g. call its leave function)
+    var nextState = this.GetCurrentState();
+    if (nextState.indexOf(".") != -1)
+        UnitFsm.SwitchToNextState(this, nextState.slice(0, nextState.indexOf(".")));
     
     // Clean up range queries
     var rangeMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);