diff options
| author | zxjordan <zxjordan5@gmail.com> | 2023-06-05 22:48:07 -0400 |
|---|---|---|
| committer | zxjordan <zxjordan5@gmail.com> | 2023-06-05 22:48:07 -0400 |
| commit | 144b9e9a16272da2a7cdde01b16dfb83f5353b07 (patch) | |
| tree | c9876abbe02ee74d68d75e827d9a26da7495e941 /src/gameplay/SongPlayer.java | |
| parent | 85037099c9ff60d55501c0ff9a70ccfaccbb95f2 (diff) | |
| parent | 5f6b84a1d3a4cf1936e7d495d03400ce5c7478f6 (diff) | |
| download | NPEhero-144b9e9a16272da2a7cdde01b16dfb83f5353b07.tar.gz NPEhero-144b9e9a16272da2a7cdde01b16dfb83f5353b07.tar.bz2 NPEhero-144b9e9a16272da2a7cdde01b16dfb83f5353b07.zip | |
Merge branch 'main' of https://gitlab.sowgro.net/npeinc/npehero
Diffstat (limited to 'src/gameplay/SongPlayer.java')
| -rw-r--r-- | src/gameplay/SongPlayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java index 436c336..3d3fe7d 100644 --- a/src/gameplay/SongPlayer.java +++ b/src/gameplay/SongPlayer.java @@ -256,7 +256,7 @@ public class SongPlayer extends Pane { sendNote(kSends, kLane, kButton); if (timer.time() > songLength) { gui.Driver.setMenu(new GameOver(level, difficulty, pane, scoreCounter.getScore())); - cancel(); + cancel(); } if (!songIsPlaying && timer.time() > 0.0) { songIsPlaying = true; @@ -278,10 +278,10 @@ public class SongPlayer extends Pane { * @throws UnsupportedAudioFileException */ public void cancel() { + Driver.soundController.endSong(); Driver.soundController.playMenuSong(); gui.Driver.setBackground("assets/mountains.png"); gameLoop.stop(); - Driver.soundController.endSong(); } /** |