Fixed SongView#getLength returning last tick instead of length

RaphiMC · May 25, 2024 · 48e71fb · 48e71fb
1 parent d3643b1
commit 48e71fb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/net/raphimc/noteblocklib/model/SongView.java b/src/main/java/net/raphimc/noteblocklib/model/SongView.java
@@ -65,7 +65,7 @@ public int getLength() {
     }
 
     public void recalculateLength() {
-        this.length = this.notes.keySet().stream().mapToInt(i -> i).max().orElse(0);
+        this.length = this.notes.keySet().stream().mapToInt(i -> i).max().orElse(-1) + 1;
     }
 
     /**

diff --git a/src/main/java/net/raphimc/noteblocklib/player/SongPlayer.java b/src/main/java/net/raphimc/noteblocklib/player/SongPlayer.java
@@ -31,7 +31,7 @@ public class SongPlayer {
     private final SongPlayerCallback callback;
 
     private ScheduledExecutorService scheduler;
-    private int tick = -1;
+    private int tick;
     private boolean paused;
 
     public SongPlayer(final SongView<?> songView, final SongPlayerCallback callback) {
@@ -80,6 +80,7 @@ public void stop() {
         } catch (InterruptedException ignored) {
         }
         this.scheduler = null;
+        this.tick = 0;
         this.paused = false;
     }
 
@@ -88,20 +89,20 @@ private void tick() {
             if (this.paused || !this.callback.shouldTick()) {
                 return;
             }
-            this.tick++;
 
-            if (this.tick > this.songView.getLength()) {
+            if (this.tick >= this.songView.getLength()) {
                 if (this.callback.shouldLoop()) {
                     this.tick = -this.callback.getLoopDelay();
                 } else {
                     this.callback.onFinished();
-                    this.tick = -1;
                     this.stop();
+                    return;
                 }
-                return;
             }
 
             this.callback.playNotes(this.songView.getNotesAtTick(this.tick));
+
+            this.tick++;
         } catch (Throwable e) {
             if (e.getCause() instanceof InterruptedException) return;