From be725e9b8ad152d55ee7eb7cafe281b9be5daf9a Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Sun, 17 Jan 2021 21:36:23 -0500
Subject: [PATCH] tweaking???

---
 CHANGELOG.md        |  1 +
 source/PlayState.hx | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601265c13..528f51949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Removed APE
 ### Fixed
+- Maybe fixed double notes / jump notes. Need to tweak it for balance, but should open things up for cooler charts in the future.
 - Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155))
 - Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
 - Screen wipe being cut off in the limo/mom stage. Should fill the whole screen now.
diff --git a/source/PlayState.hx b/source/PlayState.hx
index d108c8960..f5f4f506b 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1280,21 +1280,34 @@ class PlayState extends MusicBeatState
 				if (perfectMode)
 					noteCheck(true, daNote);
 
-				for (coolNote in possibleNotes)
+				// Jump notes
+				if (possibleNotes.length >= 2)
 				{
-					if (controlArray[coolNote.noteData])
-						goodNoteHit(coolNote);
-					else
+					if (possibleNotes[0].strumTime == possibleNotes[1].strumTime)
 					{
-						var inIgnoreList:Bool = false;
-						for (shit in 0...ignoreList.length)
+						for (coolNote in possibleNotes)
 						{
-							if (controlArray[ignoreList[shit]])
-								inIgnoreList = true;
+							if (controlArray[coolNote.noteData])
+								goodNoteHit(coolNote);
+							else
+							{
+								var inIgnoreList:Bool = false;
+								for (shit in 0...ignoreList.length)
+								{
+									if (controlArray[ignoreList[shit]])
+										inIgnoreList = true;
+								}
+								if (!inIgnoreList)
+									badNoteCheck();
+							}
 						}
-						if (!inIgnoreList)
-							badNoteCheck();
 					}
+					else
+						noteCheck(controlArray[daNote.noteData], daNote);
+				}
+				else // regular notes?
+				{
+					noteCheck(controlArray[daNote.noteData], daNote);
 				}
 				/* 
 					if (controlArray[daNote.noteData])