diff --git a/OpenRA.Game/Traits/Turreted.cs b/OpenRA.Game/Traits/Turreted.cs index 5e05518fb3..abb52b7ead 100644 --- a/OpenRA.Game/Traits/Turreted.cs +++ b/OpenRA.Game/Traits/Turreted.cs @@ -15,7 +15,7 @@ namespace OpenRA.Traits public readonly int ROT = 255; public readonly int InitialFacing = 128; - public object Create(ActorInitializer init) { return new Turreted(init.self, this); } + public object Create(ActorInitializer init) { return new Turreted(init, this); } } public class Turreted : ITick @@ -26,11 +26,12 @@ namespace OpenRA.Traits TurretedInfo info; IFacing facing; - public Turreted(Actor self, TurretedInfo info) + public Turreted(ActorInitializer init, TurretedInfo info) { this.info = info; turretFacing = info.InitialFacing; - facing = self.TraitOrDefault(); + turretFacing = init.Contains() ? init.Get() : info.InitialFacing; + facing = init.self.TraitOrDefault(); } public void Tick( Actor self )