Merge remote-tracking branch 'origin/main' into mobile

JordanSantiagoYT · Oct 12, 2024 · 3eb34c6 · 3eb34c6
2 parents de3df31 + f7adc57
commit 3eb34c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/Note.hx b/source/Note.hx
@@ -641,7 +641,7 @@ class Note extends FlxSprite
 
 		if (isSustainNote) {
 			offsetX += width / 2;
-			copyAngle = !chartNoteData.isSustainEnd;
+			copyAngle = !false;
 			animation.play(colArray[noteData % 4] + (chartNoteData.isSustainEnd ? 'holdend' : 'hold'));
 			updateHitbox();
 			offsetX -= width / 2;

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -5460,7 +5460,8 @@ class PlayState extends MusicBeatState
 					if (plrInputNotes.length > 1) {
 						var doubleNote:Note = plrInputNotes[1];
 
-						if (doubleNote.noteData == funnyNote.noteData) {
+						//if the note has the same notedata and doOppStuff indicator as funnynote, then do the check
+						if (doubleNote.noteData == funnyNote.noteData && doubleNote.doOppStuff == funnyNote.doOppStuff) {
 							// if the note has a 0ms distance (is on top of the current note), kill it
 							if (Math.abs(doubleNote.strumTime - funnyNote.strumTime) < 1.0)
 								invalidateNote(doubleNote);
@@ -5470,6 +5471,7 @@ class PlayState extends MusicBeatState
 								funnyNote = doubleNote;
 							}
 						}
+						else goodNoteHit(doubleNote); //otherwise, hit doubleNote instead of killing it
 					}
 					goodNoteHit(funnyNote);
 					if (plrInputNotes.length > 2 && ClientPrefs.ezSpam) //literally all you need to allow you to spam though impossibly hard jacks