From 68970b67161f5ac9301c954d0718d3f8ddc5c5c2 Mon Sep 17 00:00:00 2001 From: Kolo <67389779+JustKolosaki@users.noreply.github.com> Date: Thu, 2 Oct 2025 21:43:54 +0200 Subject: [PATCH] make stickers not persist --- source/funkin/ui/freeplay/FreeplayState.hx | 6 ++++-- source/funkin/ui/story/StoryMenuState.hx | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/funkin/ui/freeplay/FreeplayState.hx b/source/funkin/ui/freeplay/FreeplayState.hx index efedc0b2d..49b92e05c 100644 --- a/source/funkin/ui/freeplay/FreeplayState.hx +++ b/source/funkin/ui/freeplay/FreeplayState.hx @@ -1717,7 +1717,8 @@ class FreeplayState extends MusicBeatSubState function handleInputs(elapsed:Float):Void { - if (!controls.active) return; + @:privateAccess + if (!controls.active || (stickerSubState?.switchingState ?? false)) return; #if FEATURE_TOUCH_CONTROLS handleTouchCapsuleClick(); @@ -2119,7 +2120,8 @@ class FreeplayState extends MusicBeatSubState function goBack():Void { - if (!controls.active) return; + @:privateAccess + if (!controls.active || (stickerSubState?.switchingState ?? false)) return; backTransitioning = true; #if FEATURE_TOUCH_CONTROLS if (backButton != null) diff --git a/source/funkin/ui/story/StoryMenuState.hx b/source/funkin/ui/story/StoryMenuState.hx index 6d9c74071..5e59eb5e1 100644 --- a/source/funkin/ui/story/StoryMenuState.hx +++ b/source/funkin/ui/story/StoryMenuState.hx @@ -340,6 +340,9 @@ class StoryMenuState extends MusicBeatState function handleKeyPresses():Void { + @:privateAccess + if ((stickerSubState?.switchingState ?? false)) return; + if (!exitingMenu) { if (!selectedLevel) @@ -723,7 +726,8 @@ class StoryMenuState extends MusicBeatState function goBack():Void { - if (exitingMenu || selectedLevel) return; + @:privateAccess + if (exitingMenu || selectedLevel || (stickerSubState?.switchingState ?? false)) return; exitingMenu = true; FlxG.keys.enabled = false;