Merge ConditionManager trait directly into Actor

2020-04-18 23:25:05 -05:00
parent e12c1dc9aa
commit 259c8d2c98
65 changed files with 466 additions and 707 deletions
--- a/OpenRA.Mods.Common/Traits/Conditions/GrantRandomCondition.cs
+++ b/OpenRA.Mods.Common/Traits/Conditions/GrantRandomCondition.cs
@@ -40,8 +40,7 @@ namespace OpenRA.Mods.Common.Traits.Conditions
 				return;

 			var condition = info.Conditions.Random(self.World.SharedRandom);
-			var conditionManager = self.Trait<ConditionManager>();
-			conditionManager.GrantCondition(self, condition);
+			self.GrantCondition(condition);
 		}
 	}
 }