From 9617a474f3b82a9e6c62aca9f3ea04442a4e78d1 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Sun, 7 Apr 2024 20:37:24 -0700
Subject: [PATCH] Whitelistremoves now requires either ban or whitelist, not
both (#76)
## Mirror of PR #994: [Whitelistremoves now requires either ban or
whitelist, not both](https://github.com/DeltaV-Station/Delta-v/pull/994)
from
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)
`a2a3bcbb869530aa1511af8339d8abc2cc84eba8`
---
PR changed 0 files with 0 additions and 0 deletions.
The PR had the following labels:
- Changes: C#
---
Original Body
> ## About the PR
> Admins asked for it, and it looks to be a mistake in the code
>
> **Changelog**
> :cl:
> DELTAVADMIN:
> - fix: whitelistremove now requires either ban or whitelist, not both.
>
>
Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
---
Content.Server/Whitelist/WhitelistCommands.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
index 6a4347cdd13..6a9050f57b2 100644
--- a/Content.Server/Whitelist/WhitelistCommands.cs
+++ b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -71,7 +71,7 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg
}
}
-[AdminCommand(AdminFlags.Ban | AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist. Hopefully this is an or, not an and
+[AdminCommand(AdminFlags.Ban), AdminCommand(AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist.
public sealed class RemoveWhitelistCommand : LocalizedCommands
{
public override string Command => "whitelistremove";