diff --git a/OpenRA.Mods.Common/Traits/Turreted.cs b/OpenRA.Mods.Common/Traits/Turreted.cs index f813d21822d4..f77ca88b0882 100644 --- a/OpenRA.Mods.Common/Traits/Turreted.cs +++ b/OpenRA.Mods.Common/Traits/Turreted.cs @@ -35,7 +35,10 @@ public class TurretedInfo : ITraitInfo, UsesInit, Requires IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type) { - yield return new TurretFacingInit(PreviewFacing); + // HACK: The ActorInit system does not support multiple instances of the same type + // Make sure that we only return one TurretFacingInit, even for actors with multiple turrets + if (ai.TraitInfos().FirstOrDefault() == this) + yield return new TurretFacingInit(PreviewFacing); } public virtual object Create(ActorInitializer init) { return new Turreted(init, this); }