SBDevelopment/ThemeParkAudio
3
0
Fork 0
Code Issues Pull requests Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java
This commit is contained in:
stijnb1234 2022-05-28 20:17:13 +02:00
commit 2f8906813b
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/nl/sbdeveloper/mctpaudio/radio/Playlist.java
View file

@ -6,15 +6,13 @@ 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;
/* Copyright (C) McThemeParks - All Rights Reserved /* Copyright (C) McThemeParks - All Rights Reserved
* Unauthorized copying of this file, via any medium is strictly prohibited * Unauthorized copying of this file, via any medium is strictly prohibited
@ -23,7 +21,7 @@ import java.io.IOException;
*/ */
public class Playlist { public class Playlist {
private final SongList<String> playList = new SongList<>(); private final SongList<String> playList = Collections.synchronizedList(new SongList<>());
private boolean running = false; private boolean running = false;
private BukkitTask currentTimer; private BukkitTask currentTimer;
@ -86,6 +84,7 @@ public class Playlist {
} }
if (playList.isEmpty()) { if (playList.isEmpty()) {
playedList.clear();
start(); start();
} }