Merge pull request #8756 from atlimit8/FixUpgradableMultiplierTrait

Fix #8751 - IndexOutOfRangeException when UpgradeMultiplierTrait is pre-enabled
2015-07-20 13:23:48 +02:00
parent 30696ea23d 96cafccb8d
commit 69328af96d
1 changed files with 1 additions and 0 deletions
--- a/OpenRA.Mods.Common/Traits/Multipliers/UpgradableMultiplierTrait.cs
+++ b/OpenRA.Mods.Common/Traits/Multipliers/UpgradableMultiplierTrait.cs
@@ -45,6 +45,7 @@ namespace OpenRA.Mods.Common.Traits
 				throw new Exception("No modifiers in " + modifierType + " for " + actorType);
 			this.info = info;
 			IsTraitDisabled = info.UpgradeTypes.Length > 0 && info.BaseLevel > 0;
+			level = IsTraitDisabled ? 0 : info.BaseLevel;
 		}

 		public bool AcceptsUpgradeLevel(Actor self, string type, int level)