Avoid unnecessary UpdateState calls for BUIs (#5670)

space-wizards · Feb 12, 2025 · a734bc5 · a734bc5
1 parent 9e9ac56
commit a734bc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Robust.Shared/GameObjects/Components/UserInterface/BoundUserInterface.cs b/Robust.Shared/GameObjects/Components/UserInterface/BoundUserInterface.cs
@@ -15,6 +15,8 @@ public abstract class BoundUserInterface : IDisposable
         [Dependency] protected readonly ISharedPlayerManager PlayerManager = default!;
         protected readonly SharedUserInterfaceSystem UiSystem;
 
+        public bool IsOpened { get; protected set; }
+
         public readonly Enum UiKey;
         public EntityUid Owner { get; }
 
@@ -43,6 +45,10 @@ protected BoundUserInterface(EntityUid owner, Enum uiKey)
         /// </summary>
         protected internal virtual void Open()
         {
+            if (IsOpened)
+                return;
+
+            IsOpened = true;
         }
 
         /// <summary>
@@ -93,6 +99,10 @@ protected internal virtual void ReceiveMessage(BoundUserInterfaceMessage message
         /// </summary>
         public void Close()
         {
+            if (!IsOpened)
+                return;
+
+            IsOpened = false;
             UiSystem.CloseUi(Owner, UiKey, PlayerManager.LocalEntity, predicted: true);
         }
 

diff --git a/Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs b/Robust.Shared/GameObjects/Systems/SharedUserInterfaceSystem.cs
@@ -487,7 +487,7 @@ private void OnUserInterfaceHandleState(Entity<UserInterfaceComponent> ent, ref
 
                 ent.Comp.States[key] = buiState;
 
-                if (!ent.Comp.ClientOpenInterfaces.TryGetValue(key, out var cBui))
+                if (!ent.Comp.ClientOpenInterfaces.TryGetValue(key, out var cBui) || !cBui.IsOpened)
                     continue;
 
                 cBui.State = buiState;