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

9
Content.Server/Nuke/Commands/SendNukeCodesCommand.cs
View File

@@ -18,11 +18,6 @@ namespace Content.Server.Nuke.Commands
[Dependency] private readonly IEntityManager _entityManager = default!;
public SendNukeCodesCommand()
{
IoCManager.InjectDependencies(this);
}
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
if (args.Length != 1)
@@ -31,13 +26,13 @@ namespace Content.Server.Nuke.Commands
return;
}
if (!EntityUid.TryParse(args[0], out var uid))
if (!NetEntity.TryParse(args[0], out var uidNet) || !_entityManager.TryGetEntity(uidNet, out var uid))
{
shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
return;
}
_entityManager.System<NukeCodePaperSystem>().SendNukeCodes(uid);
_entityManager.System<NukeCodePaperSystem>().SendNukeCodes(uid.Value);
}
public CompletionResult GetCompletion(IConsoleShell shell, string[] args)

13
Content.Server/Nuke/Commands/ToggleNukeCommand.cs
View File

@@ -16,12 +16,12 @@ public sealed class ToggleNukeCommand : LocalizedCommands
public override void Execute(IConsoleShell shell, string argStr, string[] args)
{
EntityUid bombUid;
EntityUid? bombUid = null;
NukeComponent? bomb = null;
if (args.Length >= 2)
{
if (!EntityUid.TryParse(args[1], out bombUid))
if (!_entManager.TryParseNetEntity(args[1], out bombUid))
{
shell.WriteError(Loc.GetString("shell-entity-uid-must-be-number"));
return;
@@ -31,12 +31,13 @@ public sealed class ToggleNukeCommand : LocalizedCommands
{
var query = _entManager.EntityQueryEnumerator<NukeComponent>();
while (query.MoveNext(out bombUid, out bomb))
while (query.MoveNext(out var bomba, out bomb))
{
bombUid = bomba;
break;
}
if (bomb == null)
if (bombUid == null)
{
shell.WriteError(Loc.GetString("cmd-nukearm-not-found"));
return;
@@ -53,10 +54,10 @@ public sealed class ToggleNukeCommand : LocalizedCommands
return;
}
nukeSys.SetRemainingTime(bombUid, timer, bomb);
nukeSys.SetRemainingTime(bombUid.Value, timer, bomb);
}
nukeSys.ToggleBomb(bombUid, bomb);
nukeSys.ToggleBomb(bombUid.Value, bomb);
}
public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)

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

@@ -377,7 +377,7 @@ public sealed class NukeSystem : EntitySystem
CooldownTime = (int) component.CooldownTime
};
UserInterfaceSystem.SetUiState(ui, state);
_ui.SetUiState(ui, state);
}
private void PlayNukeKeypadSound(EntityUid uid, int number, NukeComponent? component = null)
@@ -568,7 +568,7 @@ public sealed class NukeSystem : EntitySystem
private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke)
{
var doAfter = new DoAfterArgs(user, nuke.DisarmDoafterLength, new NukeDisarmDoAfterEvent(), uid, target: uid)
var doAfter = new DoAfterArgs(EntityManager, user, nuke.DisarmDoafterLength, new NukeDisarmDoAfterEvent(), uid, target: uid)
{
BreakOnDamage = true,
BreakOnTargetMove = true,