Ticket #4255: upgrade.diff

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

@@ -53 +53 @@
     "</oneOrMore>";
 
 Upgrade.prototype.Init = function()
 {
     this.upgrading = false;
+    this.completed = false;
     this.elapsedTime = 0;
     this.timer = undefined;
 
     this.upgradeTemplates = {};
 
@@ -73 +74 @@
 };
 
 // This will also deal with the "OnDestroy" case.
 Upgrade.prototype.OnOwnershipChanged = function(msg)
 {
-    this.CancelUpgrade(msg.from);
+    if (!this.completed)
+        this.CancelUpgrade(msg.from);
     if (msg.to !== -1)
         this.owner = msg.to;
 };
 
 Upgrade.prototype.ChangeUpgradedEntityCount = function(amount)
 {
     if (!this.IsUpgrading())
         return;
-    
+
     let cmpTempMan = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager);
     let template = cmpTempMan.GetTemplate(this.upgrading);
 
     let category;
     if (template.TrainingRestrictions)
@@ -295 +297 @@
         return;
     }
 
     this.CancelTimer();
 
+    this.completed = true;
+
     let newEntity = ChangeEntityTemplate(this.entity, this.upgrading);
 
     if (newEntity)
         PlaySound("upgraded", newEntity);
 };