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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Nuke/NukeSystem.cs
View File

@@ -116,10 +116,10 @@ namespace Content.Server.Nuke
// standard interactions check
if (!args.InRangeUnobstructed())
return;
if (!_actionBlocker.CanInteract(args.User.Uid) || !_actionBlocker.CanUse(args.User.Uid))
if (!_actionBlocker.CanInteract(args.User) || !_actionBlocker.CanUse(args.User))
return;
if (!EntityManager.TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
ShowUI(uid, actor.PlayerSession, component);
@@ -413,7 +413,7 @@ namespace Content.Server.Nuke
var ents = _lookup.GetEntitiesInRange(pos, component.BlastRadius);
foreach (var ent in ents)
{
var entUid = ent.Uid;
var entUid = (EntityUid) ent;
if (!EntityManager.EntityExists(entUid))
continue;;