From 49f7f533b0999b2def42023587e42f88a07bce00 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Mon, 31 Oct 2022 15:06:17 +0100
Subject: [PATCH] Prevents music overlap

Makes sure to actually stop songs played for players outside the global cycle when changing to the next track in a playlist.
---
 src/main/java/net/knarcraft/minstrel/music/Playlist.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/net/knarcraft/minstrel/music/Playlist.java b/src/main/java/net/knarcraft/minstrel/music/Playlist.java
index 3d21d6b..87e77a0 100644
--- a/src/main/java/net/knarcraft/minstrel/music/Playlist.java
+++ b/src/main/java/net/knarcraft/minstrel/music/Playlist.java
@@ -126,6 +126,14 @@ public class Playlist {
             }
         }
 
+        //Prevent overlapping music if a song has been played outside the global cycle
+        for (Player player : playerCurrentSong.keySet()) {
+            Song currentSong = playerCurrentSong.get(player);
+            if (currentSong != null) {
+                currentSong.stop(player);
+            }
+        }
+
         Song currentSong = this.songs.get(this.currentlyPlaying);
         currentSong.play(trait, trait.getVolume(), trait.getPitch());
         currentlyPlaying++;