From e9ed7223b60ea482602bb9d46ccd3c9e2b605010 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 15 Dec 2023 02:29:32 -0500
Subject: [PATCH 1/2] no debugger

---
 assets                                                 |  2 +-
 source/funkin/ui/debug/charting/ChartEditorState.hx    |  9 +++++++++
 .../charting/handlers/ChartEditorToolboxHandler.hx     | 10 ++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/assets b/assets
index dfaf23dfa..c354795f7 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit dfaf23dfa11ff67be2eea9113a80ff5dc0040f76
+Subproject commit c354795f7f560fa096b855c6e6bca745f77fa414
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index 78de08fdf..9b2ffadde 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -124,6 +124,7 @@ import flixel.group.FlxGroup.FlxTypedGroup;
 import funkin.audio.visualize.PolygonVisGroup;
 import flixel.input.mouse.FlxMouseEvent;
 import flixel.text.FlxText;
+import flixel.system.debug.log.LogStyle;
 
 using Lambda;
 
@@ -544,6 +545,11 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
    */
   var playtestPracticeMode:Bool = false;
 
+  /**
+   * Enables or disables the "debugger" popup that appears when you run into a flixel error.
+   */
+  var enabledDebuggerPopup:Bool = true;
+
   // Visuals
 
   /**
@@ -4766,6 +4772,9 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       return;
     }
 
+    LogStyle.WARNING.openConsole = enabledDebuggerPopup;
+    LogStyle.ERROR.openConsole = enabledDebuggerPopup;
+
     // TODO: Rework asset system so we can remove this.
     switch (currentSongStage)
     {
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
index a9a9c375d..98d04887d 100644
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorToolboxHandler.hx
@@ -488,6 +488,16 @@ class ChartEditorToolboxHandler
       state.playtestStartTime = checkboxStartTime.selected;
     };
 
+    var checkboxDebugger:Null<CheckBox> = toolbox.findComponent('playtestDebuggerCheckbox', CheckBox);
+
+    if (checkboxDebugger == null) throw 'ChartEditorToolboxHandler.buildToolboxPlaytestPropertiesLayout() - Could not find playtestDebuggerCheckbox component.';
+
+    state.enabledDebuggerPopup = checkboxDebugger.selected;
+
+    checkboxDebugger.onClick = _ -> {
+      state.enabledDebuggerPopup = checkboxDebugger.selected;
+    };
+
     return toolbox;
   }
 

From b1c933283055bfd4c0431f5b820840a18d848a52 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Tue, 2 Jan 2024 01:33:10 -0500
Subject: [PATCH 2/2] Fix an issue where hold notes early in a song would not
 render properly.

---
 source/funkin/play/notes/SustainTrail.hx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/funkin/play/notes/SustainTrail.hx b/source/funkin/play/notes/SustainTrail.hx
index ab4bf5f16..7367b97af 100644
--- a/source/funkin/play/notes/SustainTrail.hx
+++ b/source/funkin/play/notes/SustainTrail.hx
@@ -149,9 +149,9 @@ class SustainTrail extends FlxSprite
     if (sustainLength == s) return s;
 
     height = sustainHeight(s, getScrollSpeed());
-    // updateColorTransform();
+    this.sustainLength = s;
     updateClipping();
-    return sustainLength = s;
+    return this.sustainLength;
   }
 
   /**
@@ -162,13 +162,15 @@ class SustainTrail extends FlxSprite
   public function updateClipping(songTime:Float = 0):Void
   {
     var clipHeight:Float = FlxMath.bound(sustainHeight(sustainLength - (songTime - strumTime), getScrollSpeed()), 0, height);
-    if (clipHeight == 0)
+    if (clipHeight <= 0.1)
     {
       visible = false;
       return;
     }
     else
+    {
       visible = true;
+    }
 
     var bottomHeight:Float = graphic.height * zoom * endOffset;
     var partHeight:Float = clipHeight - bottomHeight;