Merge branch 'master' of https://github.com/hykilpikonna/AquaDX

AquaMai/Fix/FixCharaCrash.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using HarmonyLib;
 using Process;
 using Util;
@@ -5,7 +7,7 @@ using Util;
 namespace AquaMai.Fix
 {
     /**
-     * Fix character selection crashing because get map color returns null
+     * Fix character selection crashing due to missing character data
      */
     public class FixCharaCrash
     {
@@ -24,5 +26,19 @@ namespace AquaMai.Fix
             __result = MapMaster.GetSlotData(1);
         }
 
+        // This is called when loading the music selection screen, to display characters on the top screen
+        [HarmonyPrefix]
+        [HarmonyPatch(typeof(Monitor.CommonMonitor), "SetCharacterSlot", new Type[] { typeof(MessageCharactorInfomationData) })]
+        public static bool SetCharacterSlot(ref MessageCharactorInfomationData data, Dictionary<int, CharacterSlotData> ____characterSlotData)
+        {
+            // Some characters are not found in this dictionary. We simply skip loading those characters
+            if (!____characterSlotData.ContainsKey(data.MapKey))
+            {
+                Console.Log($"Could not get CharacterSlotData for character [Index={data.Index}, MapKey={data.MapKey}], ignoring...");
+                return false;
+            }
+
+            return true;
+        }
     }
 }