Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #226 from Moneyl/empty-hand-crash-fix

Browse Source 
Empty hand crash fix
This commit is contained in:
Pieter-Jan Briers
2019-05-18 23:23:56 +02:00
committed by GitHub
parent d81254e389 916b1521a0
commit 877dcc996c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/GUI/ServerHandsComponent.cs
View File

@@ -462,7 +462,7 @@ namespace Content.Server.GameObjects
var playerEntity = session.AttachedEntity; var playerEntity = session.AttachedEntity;
var used = GetActiveHand?.Owner; var used = GetActiveHand?.Owner;
if (playerEntity == Owner && used != null) if (playerEntity == Owner && used != null && slot.ContainedEntity != null)
{ {
var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>(); var interactionSystem = _entitySystemManager.GetEntitySystem<InteractionSystem>();
interactionSystem.Interaction(Owner, used, slot.ContainedEntity, interactionSystem.Interaction(Owner, used, slot.ContainedEntity,