diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/AllMusic.java b/src/main/java/io/github/thehrz/allmusicreload/core/AllMusic.java index 3eecb7c..4f58496 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/AllMusic.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/AllMusic.java @@ -24,6 +24,7 @@ import java.util.*; public class AllMusic { public static final Gson gson = new Gson(); + public static final Random random = new Random(); /** * 客户端插件信道名 diff --git a/src/main/java/io/github/thehrz/allmusicreload/core/music/play/PlayMusic.java b/src/main/java/io/github/thehrz/allmusicreload/core/music/play/PlayMusic.java index 4b2e54d..2a3dbd0 100644 --- a/src/main/java/io/github/thehrz/allmusicreload/core/music/play/PlayMusic.java +++ b/src/main/java/io/github/thehrz/allmusicreload/core/music/play/PlayMusic.java @@ -471,6 +471,7 @@ public class PlayMusic { } public static void clearIdleList() { + deep.clear(); playIdleList.clear(); DataSql.clearIdleList(); } @@ -499,16 +500,16 @@ public class PlayMusic { if (size > playIdleList.size() / 2) { size = playIdleList.size() / 2; } - if (deep.size() >= size) { + while (deep.size() >= size) { deep.poll(); } do { - id = playIdleList.get(new Random().nextInt(playIdleList.size())); + id = playIdleList.get(AllMusic.random.nextInt(playIdleList.size())); } while (deep.contains(id)); deep.add(id); } else { - id = playIdleList.get(new Random().nextInt(playIdleList.size())); + id = playIdleList.get(AllMusic.random.nextInt(playIdleList.size())); } } else { id = playIdleList.get(idleNow);