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

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

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-01 03:08:32 +02:00
parent 3fb4adeb0f
commit fdd61d1c94
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -246,9 +246,12 @@ namespace Content.Server.GameObjects.Components.Instruments
public void HandSelected(HandSelectedEventArgs eventArgs) 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; InstrumentPlayer = session;
} }