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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Anomaly/AnomalySystem.Commands.cs
View File

@@ -26,13 +26,13 @@ public sealed partial class AnomalySystem
if (args.Length != 1)
shell.WriteError("Argument length must be 1");
if (!EntityUid.TryParse(args[0], out var uid))
if (!NetEntity.TryParse(args[0], out var uidNet) || !TryGetEntity(uidNet, out var uid))
return;
if (!TryComp<AnomalyComponent>(uid, out var anomaly))
return;
DoAnomalyPulse(uid, anomaly);
DoAnomalyPulse(uid.Value, anomaly);
}
[AdminCommand(AdminFlags.Fun)]
@@ -41,13 +41,13 @@ public sealed partial class AnomalySystem
if (args.Length != 1)
shell.WriteError("Argument length must be 1");
if (!EntityUid.TryParse(args[0], out var uid))
if (!NetEntity.TryParse(args[0], out var uidNet) || !TryGetEntity(uidNet, out var uid))
return;
if (!HasComp<AnomalyComponent>(uid))
return;
StartSupercriticalEvent(uid);
StartSupercriticalEvent(uid.Value);
}
private CompletionResult GetAnomalyCompletion(IConsoleShell shell, string[] args)

2
Content.Server/Anomaly/AnomalySystem.Scanner.cs
View File

@@ -79,7 +79,7 @@ public sealed partial class AnomalySystem
if (!HasComp<AnomalyComponent>(target))
return;
_doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.ScanDoAfterDuration, new ScannerDoAfterEvent(), uid, target: target, used: uid)
_doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.ScanDoAfterDuration, new ScannerDoAfterEvent(), uid, target: target, used: uid)
{
DistanceThreshold = 2f
});