Fixed game crashing when running vanilla game (without jk+) due to as…

…suming main menu is initialized directly after startup
Jump-King-Modding-Platform · Mar 20, 2022 · 0b995ff · 0b995ff
1 parent 096afe1
commit 0b995ff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/JKMP.Core/Events.cs b/JKMP.Core/Events.cs
@@ -27,5 +27,12 @@ public static void OnPostGameInitialize()
         {
             PostGameInitialized?.Invoke(DefaultEventSender, EventArgs.Empty);
         }
+
+        public static event EventHandler? GameTitleScreenLoaded;
+
+        public static void OnGameTitleScreenLoaded()
+        {
+            GameTitleScreenLoaded?.Invoke(DefaultEventSender, EventArgs.Empty);
+        }
     }
 }
diff --git a/JKMP.Core/JKCore.cs b/JKMP.Core/JKCore.cs
@@ -65,6 +65,7 @@ internal JKCore()
             Events.PostGameInitialized += OnPostGameInitialized;
             Events.PreGameUpdate += OnPreGameUpdate;
             Events.PostGameUpdate += OnPostGameUpdate;
+            Events.GameTitleScreenLoaded += OnGameTitleScreenLoaded;
         }
 
         internal void SaveConfig()
@@ -82,6 +83,10 @@ private void OnPostGameInitialized(object sender, EventArgs e)
                 JsonSerializerSettings = PluginManager.CreateDefaultJsonSerializerSettings()
             };
             Config = configs.LoadConfig<JkmpConfig>("Config");
+        }
+
+        private void OnGameTitleScreenLoaded(object sender, EventArgs e)
+        {
             startupInformation = new();
         }
 

diff --git a/JKMP.Core/Patches/GameTitleScreenPatches.cs b/JKMP.Core/Patches/GameTitleScreenPatches.cs
@@ -68,4 +68,13 @@ private static void DrawLogo()
             TextHelper.DrawString(JKContentManager.Font.MenuFont, logoText, drawPosition, Color.Gold, Vector2.Zero);
         }
     }
+
+    [HarmonyPatch(typeof(GameTitleScreen), "OnNewRun")]
+    internal static class GameTitleScreenOnNewRunPatch
+    {
+        private static void Postfix()
+        {
+            Events.OnGameTitleScreenLoaded();
+        }
+    }
 }