Fix instrument crash when you put an instrument in Urist's hands

2020-09-01 03:08:32 +02:00
parent 3fb4adeb0f
commit fdd61d1c94
1 changed files with 5 additions and 2 deletions
--- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
+++ b/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
@@ -246,9 +246,12 @@ namespace Content.Server.GameObjects.Components.Instruments

        public void HandSelected(HandSelectedEventArgs eventArgs)
        {
-            var session = eventArgs.User?.GetComponent<BasicActorComponent>()?.playerSession;
+            if (eventArgs.User == null || !eventArgs.User.TryGetComponent(out BasicActorComponent? actor))
+                return;

-            if (session == null) return;
+            var session = actor.playerSession;
+
+            if (session.Status != SessionStatus.InGame) return;

            InstrumentPlayer = session;
        }