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

ActionBlocker CanInteract uses EntityUid exclusively

Browse Source 
ActionBlockerSystem fully uses EntityUid now!
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 14:54:00 +01:00
parent b6337ffe7a
commit 48f8dd2284
44 changed files with 66 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/Components/BaseComputerUserInterfaceComponent.cs
View File

@@ -64,7 +64,7 @@ namespace Content.Server.GameObjects.Components
return; // Not powered, so this computer should probably do nothing.
}
// Can we interact?
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(sessionEntity))
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(sessionEntity.Uid))
{
sessionEntity.PopupMessageCursor(Loc.GetString("base-computer-ui-component-cannot-interact"));
return;

2
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -160,7 +160,7 @@ namespace Content.Server.Atmos.EntitySystems
if (!Resolve(uid, ref flammable, ref alerts))
return;
if (!flammable.OnFire || !_actionBlockerSystem.CanInteract(flammable.Owner) || flammable.Resisting)
if (!flammable.OnFire || !_actionBlockerSystem.CanInteract(flammable.Owner.Uid) || flammable.Resisting)
return;
flammable.Resisting = true;

2
Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs
View File

@@ -48,7 +48,7 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
private void OnActivate(EntityUid uid, GasValveComponent component, ActivateInWorldEvent args)
{
if (args.User.InRangeUnobstructed(args.Target) && Get<ActionBlockerSystem>().CanInteract(args.User))
if (args.User.InRangeUnobstructed(args.Target) && Get<ActionBlockerSystem>().CanInteract(args.User.Uid))
{
Toggle(uid, component);
SoundSystem.Play(Filter.Pvs(component.Owner), component._valveSound.GetSound(), component.Owner, AudioHelpers.WithVariation(0.25f));