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

6
Content.Server/Interaction/InteractionSystem.cs
View File

@@ -133,7 +133,7 @@ namespace Content.Server.Interaction
return;
}
if (!_actionBlockerSystem.CanInteract(userEntity))
if (!_actionBlockerSystem.CanInteract(userEntity.Uid))
return;
if (!EntityManager.TryGetEntity(msg.Dropped, out var dropped))
@@ -293,7 +293,7 @@ namespace Content.Server.Interaction
if (!ValidateInteractAndFace(user, coordinates))
return;
if (!_actionBlockerSystem.CanInteract(user))
if (!_actionBlockerSystem.CanInteract(user.Uid))
return;
// Get entity clicked upon from UID if valid UID, if not assume no entity clicked upon and null
@@ -367,7 +367,7 @@ namespace Content.Server.Interaction
/// </summary>
public void InteractHand(IEntity user, IEntity target)
{
if (!_actionBlockerSystem.CanInteract(user))
if (!_actionBlockerSystem.CanInteract(user.Uid))
return;
// all interactions should only happen when in range / unobstructed, so no range check is needed