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

Default to a regular interaction when disarm is unavailable (#3226)

Browse Source
This commit is contained in:
DrSmugleaf
2021-02-16 09:48:45 +01:00
committed by GitHub
parent 94edc0600a
commit 6a3072e4fd
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Actions/DisarmAction.cs
View File

@@ -2,6 +2,7 @@
using System; using System;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Click;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Server.Utility; using Content.Server.Utility;
using Content.Shared.Actions; using Content.Shared.Actions;
@@ -39,7 +40,23 @@ namespace Content.Server.Actions
{ {
var disarmedActs = args.Target.GetAllComponents<IDisarmedAct>().ToArray(); var disarmedActs = args.Target.GetAllComponents<IDisarmedAct>().ToArray();
if (disarmedActs.Length == 0 || !args.Performer.InRangeUnobstructed(args.Target)) return; if (!args.Performer.InRangeUnobstructed(args.Target)) return;
if (disarmedActs.Length == 0)
{
if (args.Performer.TryGetComponent(out IActorComponent? actor))
{
// Fall back to a normal interaction with the entity
var player = actor.playerSession;
var coordinates = args.Target.Transform.Coordinates;
var target = args.Target.Uid;
EntitySystem.Get<InteractionSystem>().HandleClientUseItemInHand(player, coordinates, target);
return;
}
return;
}
if (!args.Performer.TryGetComponent<SharedActionsComponent>(out var actions)) return; if (!args.Performer.TryGetComponent<SharedActionsComponent>(out var actions)) return;
if (args.Target == args.Performer || !args.Performer.CanAttack()) return; if (args.Target == args.Performer || !args.Performer.CanAttack()) return;

2
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -201,7 +201,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
} }
} }
private bool HandleClientUseItemInHand(ICommonSession session, EntityCoordinates coords, EntityUid uid) public bool HandleClientUseItemInHand(ICommonSession session, EntityCoordinates coords, EntityUid uid)
{ {
// client sanitization // client sanitization
if (!coords.IsValid(_entityManager)) if (!coords.IsValid(_entityManager))