Undid merge
This commit is contained in:
parent
2f8906813b
commit
96896bce49
1 changed files with 5 additions and 3 deletions
|
@ -6,11 +6,14 @@ import nl.sbdeveloper.mctpaudio.MCTPAudio;
|
||||||
import nl.sbdeveloper.mctpaudio.api.maps.SongList;
|
import nl.sbdeveloper.mctpaudio.api.maps.SongList;
|
||||||
import nl.sbdeveloper.mctpaudio.managers.PinManager;
|
import nl.sbdeveloper.mctpaudio.managers.PinManager;
|
||||||
import nl.sbdeveloper.mctpaudio.utils.HeadUtil;
|
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.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.scheduler.BukkitTask;
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
import org.json.simple.JSONObject;
|
import org.json.simple.JSONObject;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
|
@ -21,7 +24,7 @@ import java.util.Collections;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class Playlist {
|
public class Playlist {
|
||||||
private final SongList<String> playList = Collections.synchronizedList(new SongList<>());
|
private final SongList<String> playList = new SongList<>();
|
||||||
|
|
||||||
private boolean running = false;
|
private boolean running = false;
|
||||||
private BukkitTask currentTimer;
|
private BukkitTask currentTimer;
|
||||||
|
@ -84,7 +87,6 @@ public class Playlist {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (playList.isEmpty()) {
|
if (playList.isEmpty()) {
|
||||||
playedList.clear();
|
|
||||||
start();
|
start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,7 +111,7 @@ public class Playlist {
|
||||||
embed.setUrl(nextURL);
|
embed.setUrl(nextURL);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
MainUtil.sendMessageDiscord(embed, "<@&965684395686129724>");
|
MainUtil.sendMessageDiscord(embed);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue