fix GetSceneName throwing exceptions

- done by using regex's bump version
hk-modding · Nov 9, 2024 · 854c977 · 854c977
1 parent b74a05e
commit 854c977
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Core_FsmUtil.csproj b/Core_FsmUtil.csproj
@@ -7,7 +7,7 @@
     <AssemblyTitle>Core_FsmUtil</AssemblyTitle>
     <Description>A Hollow Knight Mod</Description>
     <Copyright>Copyright © HK Modding 2023</Copyright>
-    <AssemblyVersion>1.1.1.2</AssemblyVersion>
+    <AssemblyVersion>1.1.2.0</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <ImplicitUsings>false</ImplicitUsings>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

diff --git a/src/Hooks.cs b/src/Hooks.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using Core.FsmUtil.delegates;
 using HutongGames.PlayMaker;
 using MonoMod.RuntimeDetour;
@@ -262,7 +263,11 @@ public static FSMHookHandle<Action<PlayMakerFSM, string>> CreateStateExitedViaTr
 
         private static string GetSceneName(Fsm self)
         {
-            return GameManager.instance.GetSceneNameString();
+            string tmpSceneName = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
+            tmpSceneName = Regex.Replace(tmpSceneName, "_boss_defeated$", "");
+            tmpSceneName = Regex.Replace(tmpSceneName, "_boss$", "");
+            tmpSceneName = Regex.Replace(tmpSceneName, "_preload$", "");
+            return tmpSceneName;
         }
 
         private static void EnterState(Action<Fsm, FsmState> orig, Fsm self, FsmState state)