rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes the interaction system so that if a client sends a UseItemInHand input command while not having a valid attached entity, the handler method will block the command. Previously, the handler method would throw a NullRefException if this occurred.

Browse source
This commit is contained in:
Acruid 2019-09-06 10:13:48 -07:00
parent deb2b984eb
commit 6ca9e16670
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View file

@ -261,6 +261,11 @@ namespace Content.Server.GameObjects.EntitySystems
var userEntity = ((IPlayerSession) session).AttachedEntity;
if (userEntity == null || !userEntity.IsValid())
{
return;
}
if (userEntity.TryGetComponent(out CombatModeComponent combatMode) && combatMode.IsInCombatMode)
{
DoAttack(userEntity, coords, uid);