From 039f1219b3fd9c6e13abeabe9b6e5e0a4a4bd188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <zddm@outlook.es>
Date: Mon, 12 Oct 2020 12:42:49 +0200
Subject: [PATCH] Fix NRE in SharedCombatModeSystem when session doesn't have
 an attached entity.

---
 .../GameObjects/EntitySystems/SharedCombatModeSystem.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
index 0c17b7c518..52cee2b63f 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
@@ -17,9 +17,9 @@ namespace Content.Shared.GameObjects.EntitySystems
 
         private void CombatModeActiveHandler(CombatModeSystemMessages.SetCombatModeActiveMessage ev, EntitySessionEventArgs eventArgs)
         {
-            var entity = eventArgs.SenderSession.AttachedEntity;
+            var entity = eventArgs.SenderSession?.AttachedEntity;
 
-            if (!entity.TryGetComponent(out SharedCombatModeComponent combatModeComponent))
+            if (entity == null || !entity.TryGetComponent(out SharedCombatModeComponent combatModeComponent))
             {
                 return;
             }