From cc1a91e5cde9ea6f7b7692a092517c53f02b6a0e Mon Sep 17 00:00:00 2001 From: Tianyi Cao Date: Wed, 7 Feb 2024 20:04:15 -0800 Subject: [PATCH] Update and restore unintentionally-changed formatting --- AquaMai/Fix/FixCharaCrash.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/AquaMai/Fix/FixCharaCrash.cs b/AquaMai/Fix/FixCharaCrash.cs index 87d9c60b..2ef9c4df 100644 --- a/AquaMai/Fix/FixCharaCrash.cs +++ b/AquaMai/Fix/FixCharaCrash.cs @@ -9,16 +9,18 @@ namespace AquaMai.Fix /** * Fix character selection crashing due to missing character data */ - public class FixCharaCrash { + public class FixCharaCrash + { // Check if the return is null. If it is, make up a color [HarmonyPostfix] [HarmonyPatch(typeof(CharacterSelectProces), "GetMapColorData")] - public static void GetMapColorData(ref CharacterSelectProces __instance, ref CharacterMapColorData __result) { - if (__result != null) - return; + 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) { + if (MapMaster.GetSlotData(1) == null) + { MapMaster.GetSlotData(1).Load(); } __result = MapMaster.GetSlotData(1); @@ -26,8 +28,10 @@ namespace AquaMai.Fix [HarmonyPrefix] [HarmonyPatch(typeof(Monitor.CommonMonitor), "SetCharacterSlot", new Type[] { typeof(MessageCharactorInfomationData) })] - public static bool SetCharacterSlot(ref MessageCharactorInfomationData data, Dictionary ____characterSlotData) { - if (!____characterSlotData.ContainsKey(data.MapKey)) { + public static bool SetCharacterSlot(ref MessageCharactorInfomationData data, Dictionary ____characterSlotData) + { + if (!____characterSlotData.ContainsKey(data.MapKey)) + { Console.Log($"Could not get CharacterSlotData for character [Index={data.Index}, MapKey={data.MapKey}], ignoring..."); return false; }