Ticket #2706: returncost.diff

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

@@ -74 +74 @@
 
 // On owner change, abort the upgrade
 // This will also deal with the "OnDestroy" case.
 Upgrade.prototype.OnOwnershipChanged = function(msg)
 {
-    this.CancelUpgrade();
-
+    this.CancelUpgrade(msg.from);
     if (msg.to !== -1)
         this.owner = msg.to;
 };
 
 Upgrade.prototype.ChangeUpgradedEntityCount = function(amount)
@@ -240 +239 @@
         this.UpgradeProgress();
 
     return true;
 };
 
-Upgrade.prototype.CancelUpgrade = function()
+Upgrade.prototype.CancelUpgrade = function(owner)
 {
     if (!this.IsUpgrading())
         return;
 
-    let cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
+    let cmpPlayer = QueryPlayerIDInterface(owner, IID_Player);
     if (cmpPlayer)
-    {
-        let costs = this.GetResourceCosts(this.upgrading);
-        cmpPlayer.AddResources(costs);
-    }
+        cmpPlayer.AddResources(this.GetResourceCosts(this.upgrading));
 
     this.ChangeUpgradedEntityCount(-1);
 
     this.upgrading = false;
     this.CancelTimer();