try catch flags as well

DREDGE-Mods · Sep 22, 2024 · 80d7725 · 80d7725
1 parent 9b969a3
commit 80d7725
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/Winch/Util/BoatUtil.cs b/Winch/Util/BoatUtil.cs
@@ -368,18 +368,25 @@ public static void TakeFlag(string flagId)
 
     public static void ChangeBoatFlag(string flagId)
     {
-        WinchCore.Log.Debug($"ChangeBoatFlag({flagId})");
-        if (TryGetBoatFlagData(flagId, out BoatFlagData boatFlagData))
+        try
         {
-            bool isVanilla = boatFlagData is VanillaBoatFlagData;
-            int flagIndex = boatFlagData is VanillaBoatFlagData vanilla ? vanilla.Index : -1;
-            GameManager.Instance.SaveData.BoatFlagStyle = flagIndex;
-            SaveUtil.ActiveSaveData.SetBoatFlagStyle(isVanilla ? string.Empty : flagId);
-            GameEvents.Instance.TriggerBoatFlagChanged(flagIndex);
-            DredgeEvent.TriggerBoatFlagChanged(flagId);
+            WinchCore.Log.Debug($"ChangeBoatFlag({flagId})");
+            if (TryGetBoatFlagData(flagId, out BoatFlagData boatFlagData))
+            {
+                bool isVanilla = boatFlagData is VanillaBoatFlagData;
+                int flagIndex = boatFlagData is VanillaBoatFlagData vanilla ? vanilla.Index : -1;
+                GameManager.Instance.SaveData.BoatFlagStyle = flagIndex;
+                SaveUtil.ActiveSaveData.SetBoatFlagStyle(isVanilla ? string.Empty : flagId);
+                GameEvents.Instance.TriggerBoatFlagChanged(flagIndex);
+                DredgeEvent.TriggerBoatFlagChanged(flagId);
+            }
+            else
+                WinchCore.Log.Error($"{flagId} is an invalid flag ID!");
+        }
+        catch (Exception ex)
+        {
+            WinchCore.Log.Error(ex);
         }
-        else
-            WinchCore.Log.Error($"{flagId} is an invalid flag ID!");
     }
 
     public static void ChangeBoatColor(BoatArea area, string paintId)