diff --git a/assets b/assets index f1d58578d2..7afc66b30d 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit f1d58578d2ebc2fa18eff0280040b85d6303d028 +Subproject commit 7afc66b30d97f4251b2e22cee29309a8afaf0b75 diff --git a/source/funkin/modding/module/ModuleHandler.hx b/source/funkin/modding/module/ModuleHandler.hx index 8ba837c1ad..f23d8bef1e 100644 --- a/source/funkin/modding/module/ModuleHandler.hx +++ b/source/funkin/modding/module/ModuleHandler.hx @@ -125,7 +125,7 @@ class ModuleHandler for (key => value in moduleCache) { ScriptEventDispatcher.callEvent(value, event); - moduleCache.remove(key); + //moduleCache.remove(key); let me save some stats from each other modules } moduleCache.clear(); diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 586b26936b..283cc679c2 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -626,9 +626,7 @@ class PlayState extends MusicBeatSubState { super(); - FlxTransitionableState.skipNextTransIn = (lastParams != null); if (lastParams == null) deathCounter = 0; - //FlxTransitionableState.skipNextTransOut = false; //lastParams @@ -660,6 +658,9 @@ class PlayState extends MusicBeatSubState overrideMusic = params.overrideMusic ?? false; previousCameraFollowPoint = params.cameraFollowPoint; + FlxTransitionableState.skipNextTransIn = (params.cameraFollowPoint != null); + //FlxTransitionableState.skipNextTransOut = false; + // Don't do anything else here! Wait until create() when we attach to the camera. } @@ -1528,6 +1529,7 @@ class PlayState extends MusicBeatSubState performCleanup(); super.destroy(); + //lastParams = null; } /** @@ -2989,6 +2991,7 @@ class PlayState extends MusicBeatSubState targetVariation: currentVariation, cameraFollowPoint: cameraFollowPoint.getPosition(), }); + } } }