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

Fix removehand throwing exception when no hand exists (#1570)

Browse Source 
* Fix removehand throwing exception when no hand exists

* Message when you have no hands
This commit is contained in:
Exp
2020-08-02 17:31:43 +02:00
committed by GitHub
parent c61e6d541b
commit a73c5ba323
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/GameTicking/GameTickerCommands.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.BodySystem; using Content.Server.BodySystem;
@@ -388,8 +388,16 @@ namespace Content.Server.GameTicking
} }
var manager = player.AttachedEntity.GetComponent<BodyManagerComponent>(); var manager = player.AttachedEntity.GetComponent<BodyManagerComponent>();
var hand = manager.PartDictionary.First(x => x.Value.PartType == BodyPartType.Hand); var hand = manager.PartDictionary.FirstOrDefault(x => x.Value.PartType == BodyPartType.Hand);
manager.DisconnectBodyPart(hand.Value, true); if (hand.Value == null)
{
shell.SendText(player, "You have no hands.");
return;
}
else
{
manager.DisconnectBodyPart(hand.Value, true);
}
} }
} }
} }