Skip to content

Commit 854c977

Browse files
committed
fix GetSceneName throwing exceptions
- done by using regex's bump version
1 parent b74a05e commit 854c977

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Core_FsmUtil.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AssemblyTitle>Core_FsmUtil</AssemblyTitle>
88
<Description>A Hollow Knight Mod</Description>
99
<Copyright>Copyright © HK Modding 2023</Copyright>
10-
<AssemblyVersion>1.1.1.2</AssemblyVersion>
10+
<AssemblyVersion>1.1.2.0</AssemblyVersion>
1111
<FileVersion>$(AssemblyVersion)</FileVersion>
1212
<ImplicitUsings>false</ImplicitUsings>
1313
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>

src/Hooks.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.ComponentModel;
44
using System.Reflection;
5+
using System.Text.RegularExpressions;
56
using Core.FsmUtil.delegates;
67
using HutongGames.PlayMaker;
78
using MonoMod.RuntimeDetour;
@@ -262,7 +263,11 @@ public static FSMHookHandle<Action<PlayMakerFSM, string>> CreateStateExitedViaTr
262263

263264
private static string GetSceneName(Fsm self)
264265
{
265-
return GameManager.instance.GetSceneNameString();
266+
string tmpSceneName = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
267+
tmpSceneName = Regex.Replace(tmpSceneName, "_boss_defeated$", "");
268+
tmpSceneName = Regex.Replace(tmpSceneName, "_boss$", "");
269+
tmpSceneName = Regex.Replace(tmpSceneName, "_preload$", "");
270+
return tmpSceneName;
266271
}
267272

268273
private static void EnterState(Action<Fsm, FsmState> orig, Fsm self, FsmState state)

0 commit comments

Comments
 (0)