Inline IsValid

2021-12-03 11:32:53 +01:00
parent 1b13e5e0ec
commit 2d130e31d6
8 changed files with 17 additions and 11 deletions
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -90,7 +90,7 @@ namespace Content.Server.Interaction

            userEntity = ((IPlayerSession?) session)?.AttachedEntity;

-            if (userEntity == null || !userEntity.IsValid())
+            if (userEntity == null || !IoCManager.Resolve<IEntityManager>().EntityExists(userEntity.Uid))
            {
                Logger.WarningS("system.interaction",
                    $"Client sent interaction with no attached entity. Session={session}");