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

Roleban command error handling (#35784)

Browse Source 
roleban command jobid fail handling
This commit is contained in:
Errant
2025-03-12 06:41:01 +01:00
committed by GitHub
parent 175f5e6c2f
commit 3d898ed25a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Administration/Commands/RoleBanCommand.cs
View File

@@ -7,6 +7,8 @@ using Content.Shared.Database;
using Content.Shared.Roles; using Content.Shared.Roles;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.Prototypes;
namespace Content.Server.Administration.Commands; namespace Content.Server.Administration.Commands;
[AdminCommand(AdminFlags.Ban)] [AdminCommand(AdminFlags.Ban)]
@@ -15,6 +17,7 @@ public sealed class RoleBanCommand : IConsoleCommand
[Dependency] private readonly IPlayerLocator _locator = default!; [Dependency] private readonly IPlayerLocator _locator = default!;
[Dependency] private readonly IBanManager _bans = default!; [Dependency] private readonly IBanManager _bans = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
public string Command => "roleban"; public string Command => "roleban";
public string Description => Loc.GetString("cmd-roleban-desc"); public string Description => Loc.GetString("cmd-roleban-desc");
@@ -76,6 +79,12 @@ public sealed class RoleBanCommand : IConsoleCommand
return; return;
} }
if (!_proto.HasIndex<JobPrototype>(job))
{
shell.WriteError(Loc.GetString("cmd-roleban-job-parse",("job", job)));
return;
}
var located = await _locator.LookupIdByNameOrIdAsync(target); var located = await _locator.LookupIdByNameOrIdAsync(target);
if (located == null) if (located == null)
{ {