Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

4
Content.Server/Shuttles/ShuttleConsoleSystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Server.Shuttles
{
if (comp.Console == null) continue;
if (!_blocker.CanInteract(comp.Owner))
if (!_blocker.CanInteract(comp.OwnerUid))
{
toRemove.Add(comp);
}
@@ -122,7 +122,7 @@ namespace Content.Server.Shuttles
public void AddPilot(IEntity entity, ShuttleConsoleComponent component)
{
if (!_blocker.CanInteract(entity) ||
if (!_blocker.CanInteract(entity.Uid) ||
!entity.TryGetComponent(out PilotComponent? pilotComponent) ||
component.SubscribedPilots.Contains(pilotComponent))
{