Merge pull request #13 from nickj609/stage

v1.0.42

Core/CommandManager.cs

@@ -40,13 +40,27 @@ public void OnMapGroupCommand(CCSPlayerController? player, CommandInfo command)
                 }
 
                 // Deregister map votes from old map group
-                DeregisterMapVotes();
+                try
+                {
+                    DeregisterMapVotes();
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError($"{ex.Message}");
+                } 
 
                 // Set new map group
                 CurrentMapGroup = _mapGroup;
 
                 // Register map votes for new map group
-                RegisterMapVotes();
+                try
+                {
+                    RegisterMapVotes();
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError($"{ex.Message}");
+                } 
             }
         }
 

Core/SettingsManager.cs

@@ -127,4 +127,4 @@ private void ParseSettings()
             }
         }
     }
-}
+}

Core/VoteManager.cs

@@ -41,7 +41,7 @@ private void RegisterCustomVotes()
                         Plugin.CustomVotesApi.Get()?.AddCustomVote(
                             _option, // Command to trigger the vote
                             new List<string>(), // Aliases for the command (optional)
-                            Localizer["modes.vote.menu-title", _entry.Value], // Description
+                            Localizer["mode.vote.menu-title", _entry.Value], // Description
                             "No", // Default
                             30, // Time to vote
                             new Dictionary<string, VoteOption> // vote options

Plugin.cs

@@ -61,7 +61,6 @@ public override void Load(bool hotReload)
                 {
                     Logger.LogInformation($"Loading settings...");
                     ParseSettings();
-                    Logger.LogInformation($"Creating settings menu...");
                     SetupSettingsMenu();
                 }
             }
@@ -84,6 +83,7 @@ public override void OnAllPluginsLoaded(bool hotReload)
 
             if (Config.Votes.Enabled)
             {
+                // Ensure CS2-CustomVotes API is loaded
                 try
                 {
                     if (CustomVotesApi.Get() is null)
@@ -96,8 +96,16 @@ public override void OnAllPluginsLoaded(bool hotReload)
                 }
 
                 _isCustomVotesLoaded = true;
-                Logger.LogInformation("Registering custom votes...");
-                RegisterCustomVotes();
+
+                // Register custom votes
+                try
+                {
+                    RegisterCustomVotes();
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError($"{ex.Message}");
+                }
             }
         }
         // Constuct unload behavior to deregister votes
@@ -107,8 +115,18 @@ public override void Unload(bool hotReload)
                 if (_isCustomVotesLoaded)
                 {
                     Logger.LogInformation("Deregistering custom votes...");
-                    DeregisterCustomVotes();
+
+                    // Deregister custom votes
+                    try
+                    {
+                        DeregisterCustomVotes();
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError($"{ex.Message}");
+                    } 
                 }
+                // Unload plugin
                 base.Unload(hotReload);
         }
     }