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

Fixes server crash when clicking empty hand with full hand

Browse Source
This commit is contained in:
moneyl
2019-05-18 13:26:58 -04:00
parent d81254e389
commit 916b1521a0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,8 +462,8 @@ 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,
GridCoordinates.Nullspace); GridCoordinates.Nullspace);