fix context menu bugs (#5527)

2021-11-26 18:00:28 +13:00
parent 3447956088
commit 17560de3c7
4 changed files with 18 additions and 7 deletions
--- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
@@ -57,7 +57,8 @@ namespace Content.Client.ContextMenu.UI
        /// </summary>
        public void UpdateEntity(IEntity? entity = null)
        {
-            entity ??= Entity;
+            if (Entity != null && !Entity.Deleted)
+                entity ??= Entity;

            EntityIcon.Sprite = entity?.GetComponentOrNull<ISpriteComponent>();