tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NRE in SharedCombatModeSystem when session doesn't have an attached entity.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-10-12 12:42:49 +02:00
parent f07e5484b2
commit 039f1219b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
View File

@@ -17,9 +17,9 @@ namespace Content.Shared.GameObjects.EntitySystems
private void CombatModeActiveHandler(CombatModeSystemMessages.SetCombatModeActiveMessage ev, EntitySessionEventArgs eventArgs) 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; return;
} }