From c588c3ef8dd108677a5c3143cbd0810bb5969608 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Sun, 21 Dec 2025 22:35:33 +0200 Subject: [PATCH] Added missing ISync for conditional traits --- OpenRA.Mods.Common/Traits/Buildings/Gate.cs | 2 +- OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs | 2 +- OpenRA.Mods.Common/Traits/Cloak.cs | 2 +- OpenRA.Mods.Common/Traits/Conditions/ToggleConditionOnOrder.cs | 2 +- OpenRA.Mods.Common/Traits/FireWarheads.cs | 2 +- OpenRA.Mods.Common/Traits/Mobile.cs | 2 +- OpenRA.Mods.Common/Traits/Render/Hovers.cs | 2 +- OpenRA.Mods.Common/Traits/Turreted.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Buildings/Gate.cs b/OpenRA.Mods.Common/Traits/Buildings/Gate.cs index 70ad221a31..c64b7a1616 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/Gate.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/Gate.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits } public class Gate : PausableConditionalTrait, ITick, ITemporaryBlocker, IBlocksProjectiles, - INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove + INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove, ISync { readonly Actor self; readonly Building building; diff --git a/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs index 5095ec1dd7..ca5d06480d 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs @@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new RepairableBuilding(init.Self, this); } } - public class RepairableBuilding : ConditionalTrait, ITick + public class RepairableBuilding : ConditionalTrait, ITick, ISync { readonly IHealth health; readonly Predicate isNotActiveAlly; diff --git a/OpenRA.Mods.Common/Traits/Cloak.cs b/OpenRA.Mods.Common/Traits/Cloak.cs index 00a8e3d2a4..0e95e82218 100644 --- a/OpenRA.Mods.Common/Traits/Cloak.cs +++ b/OpenRA.Mods.Common/Traits/Cloak.cs @@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Traits public class Cloak : PausableConditionalTrait, IRenderModifier, INotifyDamage, INotifyUnloadCargo, INotifyLoadCargo, INotifyDemolition, INotifyInfiltration, - INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyDockClient, INotifyDockHost, INotifySupportPower + INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyDockClient, INotifyDockHost, INotifySupportPower, ISync { readonly float3 cloakedColor; readonly float cloakedColorAlpha; diff --git a/OpenRA.Mods.Common/Traits/Conditions/ToggleConditionOnOrder.cs b/OpenRA.Mods.Common/Traits/Conditions/ToggleConditionOnOrder.cs index a2fed98780..c653230dcd 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/ToggleConditionOnOrder.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/ToggleConditionOnOrder.cs @@ -46,7 +46,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new ToggleConditionOnOrder(this); } } - public class ToggleConditionOnOrder : PausableConditionalTrait, IResolveOrder + public class ToggleConditionOnOrder : PausableConditionalTrait, IResolveOrder, ISync { int conditionToken = Actor.InvalidConditionToken; diff --git a/OpenRA.Mods.Common/Traits/FireWarheads.cs b/OpenRA.Mods.Common/Traits/FireWarheads.cs index de4854c987..f1736399b2 100644 --- a/OpenRA.Mods.Common/Traits/FireWarheads.cs +++ b/OpenRA.Mods.Common/Traits/FireWarheads.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits } } - public class FireWarheads : PausableConditionalTrait, ITick + public class FireWarheads : PausableConditionalTrait, ITick, ISync { [Sync] int cooldown = 0; diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs index a68396d095..44deaf4da9 100644 --- a/OpenRA.Mods.Common/Traits/Mobile.cs +++ b/OpenRA.Mods.Common/Traits/Mobile.cs @@ -171,7 +171,7 @@ namespace OpenRA.Mods.Common.Traits } public class Mobile : PausableConditionalTrait, IIssueOrder, IResolveOrder, IOrderVoice, IPositionable, IMove, ITick, ICreationActivity, - IFacing, IDeathActorInitModifier, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove, IActorPreviewInitModifier, INotifyBecomingIdle + IFacing, IDeathActorInitModifier, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove, IActorPreviewInitModifier, INotifyBecomingIdle, ISync { readonly Actor self; readonly Lazy> speedModifiers; diff --git a/OpenRA.Mods.Common/Traits/Render/Hovers.cs b/OpenRA.Mods.Common/Traits/Render/Hovers.cs index c3773fb9f5..08a8ee7d2d 100644 --- a/OpenRA.Mods.Common/Traits/Render/Hovers.cs +++ b/OpenRA.Mods.Common/Traits/Render/Hovers.cs @@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Traits.Render } } - public class Hovers : ConditionalTrait, IRenderModifier, ITick + public class Hovers : ConditionalTrait, IRenderModifier, ITick, ISync { readonly HoversInfo info; readonly int stepPercentage; diff --git a/OpenRA.Mods.Common/Traits/Turreted.cs b/OpenRA.Mods.Common/Traits/Turreted.cs index 90a0797a6e..cd54620fc9 100644 --- a/OpenRA.Mods.Common/Traits/Turreted.cs +++ b/OpenRA.Mods.Common/Traits/Turreted.cs @@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new Turreted(init, this); } } - public class Turreted : PausableConditionalTrait, ITick, IDeathActorInitModifier, IActorPreviewInitModifier + public class Turreted : PausableConditionalTrait, ITick, IDeathActorInitModifier, IActorPreviewInitModifier, ISync { AttackTurreted attack; IFacing facing;