From ba83fc516a080665548ad769777d0e712f3b78c2 Mon Sep 17 00:00:00 2001
From: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date: Sat, 30 Sep 2023 17:32:24 -0400
Subject: [PATCH] Update PlayState.hx

---
 source/PlayState.hx | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index 2f38545abcf..d962c82422c 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -2557,7 +2557,7 @@ class PlayState extends MusicBeatState
 			}
 
 		cacheCountdown();
-		cachePopUpScore();
+		if (ClientPrefs.ratesAndCombo) cachePopUpScore(); //Caching the ratings is unnecessary if you turn off rating popups
 		for (key => type in precacheList)
 		{
 			//trace('Key $key is type $type');
@@ -5627,7 +5627,7 @@ if (ClientPrefs.showNPS) {
 			{
 			time = spawnTime * ClientPrefs.noteSpawnTime;
 			}
-			else
+			if (ClientPrefs.dynamicSpawnTime)
 			{
 			time = spawnTime / songSpeed;
 			}
@@ -5907,21 +5907,23 @@ if (ClientPrefs.showNPS) {
 								if (ClientPrefs.showcaseMode && !ClientPrefs.charsAndBG)
 								{
 								if (!daNote.isSustainNote) {
-								enemyHits += 1 * polyphony;
-								if (ClientPrefs.showNPS) { //i dont think we should be pushing to 2 arrays at the same time but oh well
-								oppNotesHitArray.push(1 * polyphony);
-								oppNotesHitDateArray.push(Date.now());
-								if (shouldKillNotes)
-								{
-									daNote.kill();
-								}
-								notes.remove(daNote, true);
-								if (shouldKillNotes)
-								{
-									daNote.destroy();
-								}
-								}
+									enemyHits += 1 * polyphony;
+								if (ClientPrefs.showNPS) {
+									oppNotesHitArray.push(1 * polyphony);
+									oppNotesHitDateArray.push(Date.now());
+									}
 								}
+								if (!daNote.isSustainNote) {
+									if (shouldKillNotes)
+									{
+										daNote.kill();
+									}
+									notes.remove(daNote, true);
+									if (shouldKillNotes)
+									{
+										daNote.destroy();
+									}
+									}
 								}
 						}