Merge remote-tracking branch 'upstream/master'

Colin-Tel · Oct 15, 2023 · 27a9e51 · 27a9e51
2 parents 531d423 + bc21367
commit 27a9e51
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,12 +1,24 @@
-"Changes: Sprites":
-- '**/*.rsi/*.png'
+"Changes: C#":
+  - "**/*.cs"
+
+"Changes: Documentation":
+  - "**/*.xml"
+  - "**/*.md"
+
+"Changes: Localization":
+- 'Resources/Locale/**/*.ftl'
 
 "Changes: Map":
-- 'Resources/Maps/*.yml'
-- 'Resources/Prototypes/Maps/*.yml'
+  - "Resources/Maps/**/*.yml"
+  - "Resources/Prototypes/Maps/**/*.yml"
+
+"Changes: Sprite":
+  - "**/*.rsi/*.png"
+  - "**/*.rsi/*.json"
 
 "Changes: UI":
-- '**/*.xaml*'
+  - "**/*.xaml*"
 
-"No C#":
-- all: ["!**/*.cs"]
+"Changes: YML":
+  - any: ["**/*.yml"]
+    all: ["!Resources/Maps/**/*.yml", "!Resources/Prototypes/Maps/**/*.yml"]
diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -14,6 +14,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
         with:
-          dirtyLabel: "Merge Conflict"
+          dirtyLabel: "Status: Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
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'