lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from hykilpikonna/tc21/fix-crash-slot-data-not-found 

Fix crash during call to CommonMonitor.SetCharacterSlot
pull/10/head
Azalea 2024-02-07 23:19:28 -05:00 committed by GitHub
parent c10085b65a f76a027b32
commit e1180a9a14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
AquaMai/Fix/FixCharaCrash.cs
View File

@ -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
{
@ -15,7 +17,7 @@ namespace AquaMai.Fix
public static void GetMapColorData(ref CharacterSelectProces __instance, ref CharacterMapColorData __result)
{
if (__result != null) return;
// 1 is a color that definitely exists
if (MapMaster.GetSlotData(1) == null)
{
@ -23,6 +25,20 @@ 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;
}
}
}
}