From 70624fa44f2792c39e3df46195671da15427e80c Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Wed, 6 Dec 2023 14:06:51 +0200 Subject: [PATCH] Stopped syncing IsTraitPaused/Disabled A discussion on Discord (https://discord.com/channels/153649279762694144/388282819371204608/1181890238759587881) decided we don't need to sync these. --- OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs | 3 +-- .../Traits/Conditions/PausableConditionalTrait.cs | 1 - OpenRA.Mods.Common/Traits/DamagedByTerrain.cs | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs b/OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs index d85958a7e8..81ccd9eda7 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs @@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits /// Requires basing *Info on ConditionalTraitInfo and using base(info) constructor. /// TraitEnabled will be called at creation if the trait starts enabled or does not use conditions. /// - public abstract class ConditionalTrait : IObservesVariables, IDisabledTrait, INotifyCreated, ISync where InfoType : ConditionalTraitInfo + public abstract class ConditionalTrait : IObservesVariables, IDisabledTrait, INotifyCreated where InfoType : ConditionalTraitInfo { public readonly InfoType Info; @@ -49,7 +49,6 @@ namespace OpenRA.Mods.Common.Traits yield return new VariableObserver(RequiredConditionsChanged, Info.RequiresCondition.Variables); } - [Sync] public bool IsTraitDisabled { get; private set; } protected ConditionalTrait(InfoType info) diff --git a/OpenRA.Mods.Common/Traits/Conditions/PausableConditionalTrait.cs b/OpenRA.Mods.Common/Traits/Conditions/PausableConditionalTrait.cs index bc8236bc1d..f9d9387d1c 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/PausableConditionalTrait.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/PausableConditionalTrait.cs @@ -38,7 +38,6 @@ namespace OpenRA.Mods.Common.Traits /// public abstract class PausableConditionalTrait : ConditionalTrait where InfoType : PausableConditionalTraitInfo { - [Sync] public bool IsTraitPaused { get; private set; } protected PausableConditionalTrait(InfoType info) diff --git a/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs b/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs index 5c06e75c8e..283b86f6bc 100644 --- a/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs +++ b/OpenRA.Mods.Common/Traits/DamagedByTerrain.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits public override object Create(ActorInitializer init) { return new DamagedByTerrain(this); } } - public class DamagedByTerrain : ConditionalTrait, ITick, ISync + public class DamagedByTerrain : ConditionalTrait, ITick { int damageTicks;