diff --git a/OpenRA.Mods.RA/Crate.cs b/OpenRA.Mods.RA/Crate.cs index c3bc1146be..9de41281a3 100644 --- a/OpenRA.Mods.RA/Crate.cs +++ b/OpenRA.Mods.RA/Crate.cs @@ -75,7 +75,6 @@ namespace OpenRA.Mods.RA public void Tick(Actor self) { - if( ++ticks >= self.Info.Traits.Get().Lifetime * 25 ) self.Destroy(); } diff --git a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs b/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs index f8a9e45b53..53f9f045ac 100644 --- a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs +++ b/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs @@ -26,6 +26,9 @@ namespace OpenRA.Mods.RA.Crates public override void Activate(Actor collector) { + // shit and broken. if you have a single-use and a multi-use version of the same + // support power, this only works by order-coincidence. that's stupid. + var p = collector.Owner.PlayerActor.TraitsImplementing() .FirstOrDefault(sp => sp.GetType().Name == (info as SupportPowerCrateActionInfo).Power);