Fix some mispredict reconciliation issues. (#6319)

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Content.Client/Alerts/ClientAlertsSystem.cs

@@ -76,7 +76,7 @@ internal class ClientAlertsSystem : AlertsSystem
         if (componentAlerts == null) return;
 
         //TODO: Do we really want to send alerts for non-attached entity?
-        component.Alerts = componentAlerts;
+        component.Alerts = new(componentAlerts);
         if (!CurControlled(component.Owner, _playerManager)) return;
 
         SyncAlerts?.Invoke(this, componentAlerts);

Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs

@@ -72,7 +72,7 @@ namespace Content.Client.Atmos.Visualizers
             if (!component.TryGetData(PipeColorVisuals.Color, out Color color))
                 color = Color.White;
 
-            if (!component.TryGetData(PipeVisuals.VisualState, out PipeVisualState state))
+            if (!component.TryGetData(PipeVisuals.VisualState, out PipeDirection connectedDirections))
                 return;
 
             if(!component.TryGetData(SubFloorVisuals.SubFloor, out bool subfloor))
@@ -84,7 +84,7 @@ namespace Content.Client.Atmos.Visualizers
             {
                 var layer = sprite.LayerMapGet(layerKey);
                 var dir = (PipeDirection) layerKey;
-                var visible = subfloor && state.ConnectedDirections.HasDirection(dir);
+                var visible = subfloor && connectedDirections.HasDirection(dir);
                 sprite.LayerSetVisible(layer, visible);
 
                 if (!visible) continue;

Content.Client/Botany/PlantHolderVisualizer.cs

@@ -58,12 +58,18 @@ namespace Content.Client.Botany
 
             var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
 
-            if (component.TryGetData<SpriteSpecifier>(PlantHolderVisuals.Plant, out var specifier))
+            if (component.TryGetData<string>(PlantHolderVisuals.PlantRsi, out var rsi)
+                && component.TryGetData<string>(PlantHolderVisuals.PlantState, out var state))
             {
-                var valid = !specifier.Equals(SpriteSpecifier.Invalid);
+                var valid = !string.IsNullOrWhiteSpace(state);
+
                 sprite.LayerSetVisible(PlantHolderLayers.Plant, valid);
+
                 if(valid)
-                    sprite.LayerSetSprite(PlantHolderLayers.Plant, specifier);
+                {
+                    sprite.LayerSetRSI(PlantHolderLayers.Plant, rsi);
+                    sprite.LayerSetState(PlantHolderLayers.Plant, state);
+                }
             }
 
             if (component.TryGetData<bool>(PlantHolderVisuals.HealthLight, out var health))

Content.Client/Damage/DamageVisualizer.cs

@@ -548,9 +548,9 @@ namespace Content.Client.Damage
             {
                 UpdateDamageVisuals(damageComponent, spriteComponent, damageData);
             }
-            else if (component.TryGetData<List<string>>(DamageVisualizerKeys.DamageUpdateGroups, out List<string>? delta))
+            else if (component.TryGetData(DamageVisualizerKeys.DamageUpdateGroups, out DamageVisualizerGroupData data))
             {
-                UpdateDamageVisuals(delta, damageComponent, spriteComponent, damageData);
+                UpdateDamageVisuals(data.GroupList, damageComponent, spriteComponent, damageData);
             }
         }
 

Content.Client/Rotation/RotationVisualizer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Content.Shared.Rotation;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
@@ -17,17 +17,17 @@ namespace Content.Client.Rotation
         {
             base.OnChangeData(component);
 
-            if (component.TryGetData<RotationState>(RotationVisuals.RotationState, out var state))
+            // if TryGet fails, state defaults to RotationState.Vertical.
+            component.TryGetData<RotationState>(RotationVisuals.RotationState, out var state);
+
+            switch (state)
             {
-                switch (state)
+                case RotationState.Vertical:
-                {
+                    SetRotation(component, 0);
-                    case RotationState.Vertical:
+                    break;
-                        SetRotation(component, 0);
+                case RotationState.Horizontal:
-                        break;
+                    SetRotation(component, Angle.FromDegrees(90));
-                    case RotationState.Horizontal:
+                    break;
-                        SetRotation(component, Angle.FromDegrees(90));
-                        break;
-                }
             }
         }
 

Content.Server/Botany/Components/PlantHolderComponent.cs

@@ -592,30 +592,31 @@ namespace Content.Server.Botany.Components
 
                 if (Dead)
                 {
-                    appearanceComponent.SetData(PlantHolderVisuals.Plant,
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
-                        new SpriteSpecifier.Rsi(Seed.PlantRsi, "dead"));
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantState, "dead");
                 }
                 else if (Harvest)
                 {
-                    appearanceComponent.SetData(PlantHolderVisuals.Plant,
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
-                        new SpriteSpecifier.Rsi(Seed.PlantRsi, "harvest"));
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantState, "harvest");
                 }
                 else if (Age < Seed.Maturation)
                 {
                     var growthStage = Math.Max(1, (int) ((Age * Seed.GrowthStages) / Seed.Maturation));
-                    appearanceComponent.SetData(PlantHolderVisuals.Plant,
+
-                        new SpriteSpecifier.Rsi(Seed.PlantRsi, $"stage-{growthStage}"));
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantState, $"stage-{growthStage}");
                     _lastProduce = Age;
                 }
                 else
                 {
-                    appearanceComponent.SetData(PlantHolderVisuals.Plant,
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantRsi, Seed.PlantRsi.ToString());
-                        new SpriteSpecifier.Rsi(Seed.PlantRsi, $"stage-{Seed.GrowthStages}"));
+                    appearanceComponent.SetData(PlantHolderVisuals.PlantState, $"stage-{Seed.GrowthStages}");
                 }
             }
             else
             {
-                appearanceComponent.SetData(PlantHolderVisuals.Plant, SpriteSpecifier.Invalid);
+                appearanceComponent.SetData(PlantHolderVisuals.PlantState, "");
                 appearanceComponent.SetData(PlantHolderVisuals.HealthLight, false);
             }
 

Content.Server/NodeContainer/Nodes/PipeNode.cs

@@ -327,7 +327,7 @@ namespace Content.Server.NodeContainer.Nodes
                 }
             }
 
-            appearance.SetData(PipeVisuals.VisualState, new PipeVisualState(netConnectedDirections));
+            appearance.SetData(PipeVisuals.VisualState, netConnectedDirections);
         }
     }
 }

Content.Shared/Atmos/PipeDirection.cs

@@ -11,19 +11,6 @@ namespace Content.Shared.Atmos
         VisualState
     }
 
-    [Serializable, NetSerializable]
-    public class PipeVisualState
-    {
-        // TODO ATMOS: Make this not a class and just be the field below...
-        [ViewVariables]
-        public readonly PipeDirection ConnectedDirections;
-
-        public PipeVisualState(PipeDirection connectedDirections)
-        {
-            ConnectedDirections = connectedDirections;
-        }
-    }
-
     [Flags]
     [Serializable, NetSerializable]
     public enum PipeDirection

Content.Shared/Botany/PlantHolderVisuals.cs

@@ -6,7 +6,8 @@ namespace Content.Shared.Botany
     [Serializable, NetSerializable]
     public enum PlantHolderVisuals
     {
-        Plant,
+        PlantRsi,
+        PlantState,
         HealthLight,
         WaterLight,
         NutritionLight,

Content.Shared/Chemistry/SolutionVisuals.cs

@@ -11,7 +11,7 @@ namespace Content.Shared.Chemistry
     }
 
     [Serializable, NetSerializable]
-    public class SolutionContainerVisualState
+    public class SolutionContainerVisualState : ICloneable
     {
         public readonly Color Color;
 
@@ -33,6 +33,11 @@ namespace Content.Shared.Chemistry
             Color = color;
             FilledVolumeFraction = (byte) (byte.MaxValue * filledVolumeFraction);
         }
+
+        public object Clone()
+        {
+            return new SolutionContainerVisualState(Color, FilledVolumeFraction);
+        }
     }
 
     public enum SolutionContainerLayers : byte

Content.Shared/Damage/DamageVisualizerKeys.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Damage
@@ -11,4 +12,20 @@ namespace Content.Shared.Damage
         DamageUpdateGroups,
         ForceUpdate
     }
+
+    [Serializable, NetSerializable]
+    public class DamageVisualizerGroupData : ICloneable
+    {
+        public List<string> GroupList;
+
+        public DamageVisualizerGroupData(List<string> groupList)
+        {
+            GroupList = groupList;
+        }
+
+        public object Clone()
+        {
+            return new DamageVisualizerGroupData(new List<string>(GroupList));
+        }
+    }
 }

Content.Shared/Damage/Systems/DamageableSystem.cs

@@ -87,7 +87,10 @@ namespace Content.Shared.Damage
             component.Dirty();
 
             if (EntityManager.TryGetComponent<AppearanceComponent>(component.Owner, out var appearance) && damageDelta != null)
-                appearance.SetData(DamageVisualizerKeys.DamageUpdateGroups, damageDelta.GetDamagePerGroup().Keys.ToList());
+            {
+                var data = new DamageVisualizerGroupData(damageDelta.GetDamagePerGroup().Keys.ToList());
+                appearance.SetData(DamageVisualizerKeys.DamageUpdateGroups, data);
+            }
             RaiseLocalEvent(component.Owner, new DamageChangedEvent(component, damageDelta, interruptsDoAfters), false);
         }
 
@@ -198,7 +201,7 @@ namespace Content.Shared.Damage
             component.DamageModifierSetId = state.ModifierSetId;
 
             // Has the damage actually changed?
-            DamageSpecifier newDamage = new() { DamageDict = state.DamageDict };
+            DamageSpecifier newDamage = new() { DamageDict = new(state.DamageDict) };
             var delta = component.Damage - newDamage;
             delta.TrimZeros();
 

Content.Shared/Hands/Components/SharedHandsComponent.cs

@@ -718,7 +718,7 @@ namespace Content.Shared.Hands.Components
     }
 
     [Serializable, NetSerializable]
-    public class HandsVisualState
+    public class HandsVisualState : ICloneable
     {
         public List<HandVisualState> Hands { get; } = new();
 
@@ -726,10 +726,15 @@ namespace Content.Shared.Hands.Components
         {
             Hands = hands;
         }
+
+        public object Clone()
+        {
+            return new HandsVisualState(new List<HandVisualState>(Hands));
+        }
     }
 
     [Serializable, NetSerializable]
-    public class HandVisualState
+    public struct HandVisualState
     {
         public string RsiPath { get; }
         public string? EquippedPrefix { get; }

Content.Shared/StatusEffect/StatusEffectsSystem.cs

@@ -38,7 +38,7 @@ namespace Content.Shared.StatusEffect
                 foreach (var state in status.ActiveEffects.ToArray())
                 {
                     // if we're past the end point of the effect
-                    if (_gameTiming.CurTime > state.Value.Cooldown.Item2)
+                    if (curTime > state.Value.Cooldown.Item2)
                     {
                         TryRemoveStatusEffect(status.Owner, state.Key, status);
                     }
@@ -53,24 +53,33 @@ namespace Content.Shared.StatusEffect
 
         private void OnHandleState(EntityUid uid, StatusEffectsComponent component, ref ComponentHandleState args)
         {
-            if (args.Current is StatusEffectsComponentState state)
+            if (args.Current is not StatusEffectsComponentState state)
+                return;
+
+            component.AllowedEffects = new(state.AllowedEffects);
+
+            // Remove non-existent effects.
+            foreach (var effect in component.ActiveEffects.Keys)
             {
-                component.AllowedEffects = state.AllowedEffects;
+                if (!state.ActiveEffects.ContainsKey(effect))
-
-                foreach (var effect in state.ActiveEffects)
                 {
-                    // don't bother with anything if we already have it
+                    TryRemoveStatusEffect(uid, effect, component);
-                    if (component.ActiveEffects.ContainsKey(effect.Key))
-                    {
-                        component.ActiveEffects[effect.Key] = effect.Value;
-                        continue;
-                    }
-
-                    var time = effect.Value.Cooldown.Item2 - effect.Value.Cooldown.Item1;
-                    //TODO: Not sure how to handle refresh here.
-                    TryAddStatusEffect(uid, effect.Key, time, true);
                 }
             }
+
+            foreach (var effect in state.ActiveEffects)
+            {
+                // don't bother with anything if we already have it
+                if (component.ActiveEffects.ContainsKey(effect.Key))
+                {
+                    component.ActiveEffects[effect.Key] = effect.Value;
+                    continue;
+                }
+
+                var time = effect.Value.Cooldown.Item2 - effect.Value.Cooldown.Item1;
+                //TODO: Not sure how to handle refresh here.
+                TryAddStatusEffect(uid, effect.Key, time, true);
+            }
         }
 
         /// <summary>
@@ -187,7 +196,7 @@ namespace Content.Shared.StatusEffect
                 _alertsSystem.ShowAlert(uid, proto.Alert.Value, null, cooldown1);
             }
 
-            status.Dirty();
+            Dirty(status);
             // event?
             return true;
         }
@@ -261,7 +270,7 @@ namespace Content.Shared.StatusEffect
 
             status.ActiveEffects.Remove(key);
 
-            status.Dirty();
+            Dirty(status);
             // event?
             return true;
         }
@@ -285,6 +294,7 @@ namespace Content.Shared.StatusEffect
                     failed = true;
             }
 
+            Dirty(status);
             return failed;
         }
 
@@ -352,6 +362,7 @@ namespace Content.Shared.StatusEffect
                 _alertsSystem.ShowAlert(uid, proto.Alert.Value, null, cooldown);
             }
 
+            Dirty(status);
             return true;
         }
 
@@ -387,6 +398,7 @@ namespace Content.Shared.StatusEffect
                 _alertsSystem.ShowAlert(uid, proto.Alert.Value, null, cooldown);
             }
 
+            Dirty(status);
             return true;
         }
 
@@ -406,6 +418,8 @@ namespace Content.Shared.StatusEffect
                 return false;
 
             status.ActiveEffects[key].Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + time);
+
+            Dirty(status);
             return true;
         }
 

Content.Shared/Storage/Components/SharedMapLayerData.cs

@@ -24,7 +24,7 @@ namespace Content.Shared.Storage.Components
     }
 
     [Serializable, NetSerializable]
-    public class ShowLayerData
+    public class ShowLayerData : ICloneable
     {
         public IReadOnlyList<string> QueuedEntities { get; internal set; }
 
@@ -33,14 +33,14 @@ namespace Content.Shared.Storage.Components
             QueuedEntities = new List<string>();
         }
 
-        public ShowLayerData(IReadOnlyList<string> other)
+        public ShowLayerData(IEnumerable<string> other)
         {
-            QueuedEntities = other;
+            QueuedEntities = new List<string>(other);
         }
 
-        public ShowLayerData(ShowLayerData other)
+        public object Clone()
         {
-            QueuedEntities = other.QueuedEntities;
+            return new ShowLayerData(QueuedEntities);
         }
     }
 }