Merge pull request #7702 from abcdefg30/tscrash

Fix a crash in UpgradeActorsNear.cs
2015-03-22 13:58:05 +00:00
parent 8fd4eca2da 5d7f6081e4
commit bcc3aefaa7
1 changed files with 2 additions and 1 deletions
--- a/OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
+++ b/OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
@@ -115,7 +115,8 @@ namespace OpenRA.Mods.Common.Traits
 				var um = produced.TraitOrDefault<UpgradeManager>();
 				if (um != null)
 					foreach (var u in info.Upgrades)
-						um.GrantTimedUpgrade(produced, u, 1);
+						if (um.AcceptsUpgrade(produced, u))
+							um.GrantTimedUpgrade(produced, u, 1);
 			}
 		}