From f7ddb969c61928aeabb52bfe8d1925801b3b5eb9 Mon Sep 17 00:00:00 2001 From: Markus Hartung Date: Thu, 1 Jun 2017 00:01:18 +0200 Subject: [PATCH] Change so Attack* calls Created on base class --- OpenRA.Mods.Common/Traits/Attack/AttackBase.cs | 4 +++- OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs index 8011aff53c..58d4391307 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs @@ -60,13 +60,15 @@ namespace OpenRA.Mods.Common.Traits this.self = self; } - void INotifyCreated.Created(Actor self) + protected override void Created(Actor self) { facing = self.TraitOrDefault(); building = self.TraitOrDefault(); positionable = self.TraitOrDefault(); getArmaments = InitializeGetArmaments(self); + + base.Created(self); } protected virtual Func> InitializeGetArmaments(Actor self) diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs b/OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs index f846cf2af0..dc92cfa313 100644 --- a/OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs +++ b/OpenRA.Mods.Common/Traits/Attack/AttackCharges.cs @@ -49,9 +49,11 @@ namespace OpenRA.Mods.Common.Traits this.info = info; } - void INotifyCreated.Created(Actor self) + protected override void Created(Actor self) { conditionManager = self.TraitOrDefault(); + + base.Created(self); } void ITick.Tick(Actor self)