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

ActionBlocker CanMove uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:15:55 +01:00
parent 1f9e1c033f
commit 5f9cfaac43
10 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/AI/Steering/AiSteeringSystem.cs
View File

@@ -250,7 +250,7 @@ namespace Content.Server.AI.Steering
// Main optimisation to be done below is the redundant calls and adding more variables
if (entity.Deleted ||
!entity.TryGetComponent(out AiControllerComponent? controller) ||
!EntitySystem.Get<ActionBlockerSystem>().CanMove(entity) ||
!EntitySystem.Get<ActionBlockerSystem>().CanMove(entity.Uid) ||
!entity.Transform.GridID.IsValid())
{
return SteeringStatus.NoPath;

2
Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.ActionBlocker
{
var self = context.GetState<SelfState>().GetValue();
if (self == null || !EntitySystem.Get<ActionBlockerSystem>().CanMove(self))
if (self == null || !EntitySystem.Get<ActionBlockerSystem>().CanMove(self.Uid))
{
return 0.0f;
}

2
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.Climbing
private void AddClimbVerb(EntityUid uid, ClimbableComponent component, GetAlternativeVerbsEvent args)
{
if (!args.CanAccess || !args.CanInteract || !_actionBlockerSystem.CanMove(args.User))
if (!args.CanAccess || !args.CanInteract || !_actionBlockerSystem.CanMove(args.User.Uid))
return;
// Check that the user climb.

2
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -98,7 +98,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (!args.CanAccess ||
!args.CanInteract ||
component.ContainedEntities.Contains(args.User) ||
!_actionBlockerSystem.CanMove(args.User))
!_actionBlockerSystem.CanMove(args.User.Uid))
return;
// Add verb to climb inside of the unit,

2
Content.Server/Medical/MedicalScannerSystem.cs
View File

@@ -60,7 +60,7 @@ namespace Content.Server.Medical
// Self-insert verb
if (!component.IsOccupied &&
component.CanInsert(args.User) &&
_actionBlockerSystem.CanMove(args.User))
_actionBlockerSystem.CanMove(args.User.Uid))
{
Verb verb = new();
verb.Act = () => component.InsertBody(args.User);