Merge branch 'master' into Halloween-PR

DeltaV-Station · Oct 15, 2023 · 8089f8c · 8089f8c
2 parents ac777c9 + bc21367
commit 8089f8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -45,7 +45,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
             if (player.TryGetPlayerDataByUsername(name, out var playerData) &&
                 player.TryGetSessionByUsername(name, out var session))
             {
-                playerData.ContentData()!.Whitelisted = false;
+                playerData.ContentData()!.Whitelisted = true;
                 playtime.SendWhitelistCached(session);
             }
 

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -491,3 +491,9 @@ Entries:
       message: bees can now be put in inventory and ground up as a beverage/ingredient
   id: 67
   time: '2023-09-28T17:52:08.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Fix
+      message: Whitelists no longer require server restarts
+  id: 68
+  time: '2023-10-14T23:37:53.0000000+00:00'