From 136e086a2bc4ddb6560197fc2d2a173c114614b9 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Tue, 16 May 2023 15:00:13 +1200 Subject: [PATCH] Fix action state handling (#16491) --- Content.Client/Actions/ActionsSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index c4f3b14495..08cdb8c832 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -78,7 +78,6 @@ namespace Content.Client.Actions } act.CopyFrom(serverAct); - serverActions.Remove(serverAct); } var added = new List(); @@ -86,6 +85,9 @@ namespace Content.Client.Actions // Anything that remains is a new action foreach (var newAct in serverActions) { + if (component.Actions.Contains(newAct)) + continue; + // We create a new action, not just sorting a reference to the state's action. var action = (ActionType) newAct.Clone(); component.Actions.Add(action); -- 2.51.2