From 96896bce49892005b8ba1fa30caca2258b6dc24e Mon Sep 17 00:00:00 2001 From: stijnb1234 Date: Sat, 28 May 2022 20:19:47 +0200 Subject: [PATCH] Undid merge --- .../java/nl/sbdeveloper/mctpaudio/radio/Playlist.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java b/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java index 14f9a95..8e8912a 100644 --- a/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java +++ b/src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java @@ -6,11 +6,14 @@ import nl.sbdeveloper.mctpaudio.MCTPAudio; import nl.sbdeveloper.mctpaudio.api.maps.SongList; import nl.sbdeveloper.mctpaudio.managers.PinManager; import nl.sbdeveloper.mctpaudio.utils.HeadUtil; +import nl.sbdeveloper.mctpaudio.utils.MainUtil; +import nl.sbdeveloper.mctpaudio.utils.WebhookMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; import org.json.simple.JSONObject; +import java.awt.*; import java.io.IOException; import java.util.Collections; @@ -21,7 +24,7 @@ import java.util.Collections; */ public class Playlist { - private final SongList playList = Collections.synchronizedList(new SongList<>()); + private final SongList playList = new SongList<>(); private boolean running = false; private BukkitTask currentTimer; @@ -84,7 +87,6 @@ public class Playlist { } if (playList.isEmpty()) { - playedList.clear(); start(); } @@ -109,7 +111,7 @@ public class Playlist { embed.setUrl(nextURL); try { - MainUtil.sendMessageDiscord(embed, "<@&965684395686129724>"); + MainUtil.sendMessageDiscord(embed); } catch (IOException e) { e.printStackTrace(); }