From 93e23ebc695c5f271fe8cb98849b6e042f24230d Mon Sep 17 00:00:00 2001
From: Frakits <xgamerxthegamer@gmail.com>
Date: Fri, 25 Jul 2025 20:00:10 +0300
Subject: [PATCH] I FIXED THIS SHIT!!!!!!!!!!!!!!

---
 source/funkin/editors/charter/CharterEventAdd.hx       | 10 +++++++++-
 source/funkin/editors/charter/CharterEventGroup.hx     |  5 +++--
 source/funkin/editors/charter/CharterEventScreenNew.hx |  5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/source/funkin/editors/charter/CharterEventAdd.hx b/source/funkin/editors/charter/CharterEventAdd.hx
index 0031a78d..dca9d308 100644
--- a/source/funkin/editors/charter/CharterEventAdd.hx
+++ b/source/funkin/editors/charter/CharterEventAdd.hx
@@ -30,12 +30,17 @@ class CharterEventAdd extends UISliceSprite {
 			if (curCharterEvent != null)
 				Charter.instance.openSubState(new CharterEventScreenNew(curCharterEvent));
 			else {
+				CharterEventGroup.stopThisFuckingShitDudeIstg = true;
 				var chartEvent = new CharterEvent(step, [], global);
-				chartEvent.events = [];
 				chartEvent.global = global;
 
 				Charter.instance.createSelection([chartEvent]);
 				Charter.instance.openSubState(new CharterEventScreenNew(chartEvent));
+				sprAlpha = 0;
+				alpha = sprAlpha * 0.75;
+				text.alpha = sprAlpha;
+
+				sideText.alpha = sprAlpha;
 			}
 		}
 	}
@@ -43,6 +48,7 @@ class CharterEventAdd extends UISliceSprite {
 	public override function update(elapsed:Float) {
 		super.update(elapsed);
 
+		if (FlxG.state.subState != null) return;
 		text.follow(this, global ? bWidth - text.width - (text.text == TU.translate("charter.addEvent") ? 15 : 20) : 20, (bHeight - text.height) / 2);
 		sideText.follow(this, (bWidth/2) - (sideText.fieldWidth/2), -(sideText.height + 2));
 		alpha = sprAlpha * 0.75;
@@ -52,6 +58,7 @@ class CharterEventAdd extends UISliceSprite {
 	}
 
 	public function updatePos(step:Float) {
+		if (FlxG.state.subState != null) return;
 		curCharterEvent = null;
 		this.step = step;
 		this.y = (step * 40) - (bHeight / 2);
@@ -61,6 +68,7 @@ class CharterEventAdd extends UISliceSprite {
 	}
 
 	public function updateEdit(event:CharterEvent) {
+		if (FlxG.state.subState != null) return;
 		curCharterEvent = event;
 		this.y = event.y;
 		text.text = TU.translate("charter.editEvent");
diff --git a/source/funkin/editors/charter/CharterEventGroup.hx b/source/funkin/editors/charter/CharterEventGroup.hx
index d7be0864..41c9e09e 100644
--- a/source/funkin/editors/charter/CharterEventGroup.hx
+++ b/source/funkin/editors/charter/CharterEventGroup.hx
@@ -4,6 +4,7 @@ import flixel.util.FlxSort;
 import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
 
 class CharterEventGroup extends FlxTypedGroup<CharterEvent> {
+	public static var stopThisFuckingShitDudeIstg = false;
 	public var eventsBackdrop:EventBackdrop;
 	public var eventsRowText:UIText;
 
@@ -11,12 +12,12 @@ class CharterEventGroup extends FlxTypedGroup<CharterEvent> {
 	var __lastSort:Int = 0;
 
 	public override function update(elapsed:Float) {
-		filterEvents();
+		super.update(elapsed);
+		if (!CharterEventGroup.stopThisFuckingShitDudeIstg) filterEvents();
 		if (autoSort && members.length != __lastSort)
 			sortEvents();
 
 		eventsRowText.y = FlxMath.lerp(eventsRowText.y, -40 + (members[0] != null ? Math.min(members[0].y, 0) : 0), 1/20);
-		super.update(elapsed);
 	}
 
 	public override function remove(v:CharterEvent, force:Bool = true):CharterEvent {
diff --git a/source/funkin/editors/charter/CharterEventScreenNew.hx b/source/funkin/editors/charter/CharterEventScreenNew.hx
index 2ea20ce6..6f1fb7fd 100644
--- a/source/funkin/editors/charter/CharterEventScreenNew.hx
+++ b/source/funkin/editors/charter/CharterEventScreenNew.hx
@@ -284,9 +284,8 @@ class CharterEventScreenNew extends MusicBeatSubstate {
 	}
 
 	public function quit() {
+		CharterEventGroup.stopThisFuckingShitDudeIstg = false;
 		saveCurTab();
-		chartEvent.refreshEventIcons();
-		Charter.instance.updateBPMEvents();
 
 		if (events.length <= 0)
 			Charter.instance.deleteSelection([chartEvent]);
@@ -296,6 +295,8 @@ class CharterEventScreenNew extends MusicBeatSubstate {
 
 			Charter.undos.addToUndo(CEditEvent(chartEvent, oldEvents, [for (event in events) Reflect.copy(event)]));
 		}
+		chartEvent.refreshEventIcons();
+		Charter.instance.updateBPMEvents();
 		close();
 	}