epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conditional traits that incorrectly override INotifyCreated.

Browse Source
This commit is contained in:
Paul Chote
2019-07-13 13:02:24 +01:00
committed by teinarss
parent 37325dbfc7
commit 6eaf615798
10 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public class ReloadAmmoPool : PausableConditionalTrait<ReloadAmmoPoolInfo>, ITick, INotifyCreated, INotifyAttack, ISync
public class ReloadAmmoPool : PausableConditionalTrait<ReloadAmmoPoolInfo>, ITick, INotifyAttack, ISync
{
AmmoPool ammoPool;
IReloadAmmoModifier[] modifiers;
@@ -54,11 +54,12 @@ namespace OpenRA.Mods.Common.Traits
public ReloadAmmoPool(ReloadAmmoPoolInfo info)
: base(info) { }
void INotifyCreated.Created(Actor self)
protected override void Created(Actor self)
{
ammoPool = self.TraitsImplementing<AmmoPool>().Single(ap => ap.Info.Name == Info.AmmoPool);
modifiers = self.TraitsImplementing<IReloadAmmoModifier>().ToArray();
remainingTicks = Info.Delay;
base.Created(self);
}
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)