Ticket #2238: garrison.diff

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

@@ -390 +390 @@
  */
 GarrisonHolder.prototype.OnHealthChanged = function(msg)
 {
-    if (!this.HasEnoughHealth())
-        this.EjectOrKill(this.entities);
+    if (!this.HasEnoughHealth() && this.entities.length)
+    {
+        var entities = this.entities.slice(0, this.entities.length);
+        this.EjectOrKill(entities);
+    }
 };
 
 /**
@@ -532 +535 @@
 GarrisonHolder.prototype.EjectOrKill = function(entities)
 {
     var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
-    // Destroy the garrisoned units if the holder kill his entities on destroy or
-    // is not in the world (generally means this holder is inside 
-    // a holder which kills its entities which has sunk).
-    if (!this.EjectEntitiesOnDestroy() || !cmpPosition.IsInWorld())
+    // Eject the units which can be ejected (if not in world, it generally means this holder
+    // is inside a holder which kills its entities, so do not eject)
+    if (cmpPosition.IsInWorld() && this.EjectEntitiesOnDestroy())
+        this.PerformEject(entities, true);
+
+    // And destroy all remaining entities
+    for each (var entity in entities)
     {
-        for each (var entity in entities)
-        {
-            var cmpHealth = Engine.QueryInterface(entity, IID_Health);
-            if (cmpHealth)
-                cmpHealth.Kill();
-            var entityIndex = this.entities.indexOf(entity);
-            this.entities.splice(entityIndex, 1);
-            Engine.PostMessage(this.entity, MT_GarrisonedUnitsChanged, {});
-        }
-        this.UpdateGarrisonFlag();
+        var entityIndex = this.entities.indexOf(entity);
+        if (entityIndex == -1)
+            continue;
+        var cmpHealth = Engine.QueryInterface(entity, IID_Health);
+        if (cmpHealth)
+            cmpHealth.Kill();
+        this.entities.splice(entityIndex, 1);
+        Engine.PostMessage(this.entity, MT_GarrisonedUnitsChanged, {});
     }
-    else
-    {   // Building - force ejection
-        this.PerformEject(entities, true);
-    }
+
+    this.UpdateGarrisonFlag();
 };
 
 Engine.RegisterComponentType(IID_GarrisonHolder, "GarrisonHolder", GarrisonHolder);