Merge branch 'fix/mapName' of github.com:edgegamers/DiscordStatus

edgegamers · Feb 25, 2024 · 821e9ed · 821e9ed
2 parents 209e4ee + dc68eea
commit 821e9ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/DiscordStatus.cs b/src/DiscordStatus.cs
@@ -26,7 +26,8 @@ public override async void Load(bool hotReload)
         {
             Server.NextFrame(() =>
             {
-                _g.MapName = NativeAPI.GetMapName();
+                if (string.IsNullOrEmpty(_g.MapName))
+                    _g.MapName = NativeAPI.GetMapName();
             });
             RegisterListeners();
             if (!hotReload)

diff --git a/src/Events.cs b/src/Events.cs
@@ -43,10 +43,10 @@ private void OnMapStart(string mapName)
             else
             {
                 DSLog.Log(1, $"Map {_g.MapName} changed to {mapName}!");
+                _g.MapName = mapName;
                 if (!_g.WConfig.NewMapNotification) return;
                 var playercounts = Utilities.GetPlayers().Where(_chores.IsPlayerValid).Count();
                 _webhook.NewMap(mapName, playercounts);
-                _g.MapName = mapName;
             }
         }