diff --git a/src/main/java/Color_yr/ALLMusic/Command/CommandEX.java b/src/main/java/Color_yr/ALLMusic/Command/CommandEX.java index 7368b263..7dc2eb4b 100644 --- a/src/main/java/Color_yr/ALLMusic/Command/CommandEX.java +++ b/src/main/java/Color_yr/ALLMusic/Command/CommandEX.java @@ -36,10 +36,6 @@ public class CommandEX { ALLMusic.Config.RemoveNoMusicPlayer(Name); if (ALLMusic.Side.NeedPlay()) { ALLMusic.Side.RunTask(() -> PlayMusic.addMusic(MusicID, Name, false)); - if (ALLMusic.Config.isPlayListSwitch() && (PlayMusic.NowPlayMusic != null && PlayMusic.NowPlayMusic.isList())) { - PlayMusic.MusicAllTime = 1; - ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2切换到玩家歌曲"); - } ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§2点歌成功"); } else ALLMusic.Side.SendMessage(sender, "§d[ALLMusic]§c没有播放的玩家"); diff --git a/src/main/java/Color_yr/ALLMusic/Play/PlayGo.java b/src/main/java/Color_yr/ALLMusic/Play/PlayGo.java index 1d1d0501..774b583c 100644 --- a/src/main/java/Color_yr/ALLMusic/Play/PlayGo.java +++ b/src/main/java/Color_yr/ALLMusic/Play/PlayGo.java @@ -63,7 +63,7 @@ class PlayGo extends Thread { if (ALLMusic.Side.NeedPlay()) { String obj = GetList.GetMusic(); if (obj != null) { - PlayMusic.addMusic(obj, "空闲列表", true); + ALLMusic.Side.RunTask(() -> PlayMusic.addMusic(obj, "空闲列表", true)); } } Thread.sleep(3000); @@ -93,7 +93,7 @@ class PlayGo extends Thread { } if (PlayMusic.NowPlayMusic.getLength() != 0) { PlayMusic.MusicAllTime = PlayMusic.NowPlayMusic.getLength() / 1000; - ALLMusic.Side.bq("§d[ALLMusic]§2" + "正在播放歌曲" + PlayMusic.NowPlayMusic.getInfo()); + ALLMusic.Side.RunTask(() -> ALLMusic.Side.bq("§d[ALLMusic]§2" + "正在播放歌曲" + PlayMusic.NowPlayMusic.getInfo())); if (PlayMusic.haveLyric) startTimer(); ALLMusic.Side.Send("[Play]" + ALLMusic.Config.getMusic_Api1() + @@ -116,12 +116,12 @@ class PlayGo extends Thread { int players = ALLMusic.Side.GetAllPlayer(); if (PlayMusic.VotePlayer.size() >= ALLMusic.Config.getMinVote() || (players <= ALLMusic.Config.getMinVote() && players <= PlayMusic.VotePlayer.size())) { - ALLMusic.Side.bq("§d[ALLMusic]§2" + "已切歌"); + ALLMusic.Side.RunTask(() -> ALLMusic.Side.bq("§d[ALLMusic]§2" + "已切歌")); ALLMusic.Side.Send("[Stop]", false); PlayMusic.VotePlayer.clear(); PlayMusic.MusicAllTime = 1; if (PlayMusic.getSize() == 0) { - ALLMusic.Side.bq("§d[ALLMusic]§2" + "队列中无歌曲"); + ALLMusic.Side.RunTask(() -> ALLMusic.Side.bq("§d[ALLMusic]§2" + "队列中无歌曲")); } PlayMusic.VoteTime = 0; PlayMusic.NowPlayMusic = null; @@ -138,7 +138,7 @@ class PlayGo extends Thread { if (PlayMusic.haveLyric) close(); } else { - ALLMusic.Side.bq("§d[ALLMusic]§2" + "无效歌曲" + PlayMusic.NowPlayMusic.getID()); + ALLMusic.Side.RunTask(() -> ALLMusic.Side.bq("§d[ALLMusic]§2" + "无效歌曲" + PlayMusic.NowPlayMusic.getID())); } PlayMusic.NowPlayMusic = null; if (ALLMusic.VV != null && PlayMusic.getSize() == 0) { diff --git a/src/main/java/Color_yr/ALLMusic/Play/PlayMusic.java b/src/main/java/Color_yr/ALLMusic/Play/PlayMusic.java index f57984e2..aa76d184 100644 --- a/src/main/java/Color_yr/ALLMusic/Play/PlayMusic.java +++ b/src/main/java/Color_yr/ALLMusic/Play/PlayMusic.java @@ -51,6 +51,10 @@ public class PlayMusic { } else { ALLMusic.Side.bq("§d[ALLMusic]§2无效歌曲" + ID); } + if (ALLMusic.Config.isPlayListSwitch() && (PlayMusic.NowPlayMusic != null && PlayMusic.NowPlayMusic.isList())) { + PlayMusic.MusicAllTime = 1; + ALLMusic.Side.bq("§d[ALLMusic]§2切换到玩家歌曲"); + } } catch (Exception e) { ALLMusic.log.warning("§d[ALLMusic]§c歌曲信息解析错误"); e.printStackTrace(); diff --git a/src/main/java/Color_yr/ALLMusic/SongInfo/InfoOBJ.java b/src/main/java/Color_yr/ALLMusic/SongInfo/InfoOBJ.java index 11650bda..68dca657 100644 --- a/src/main/java/Color_yr/ALLMusic/SongInfo/InfoOBJ.java +++ b/src/main/java/Color_yr/ALLMusic/SongInfo/InfoOBJ.java @@ -39,6 +39,8 @@ public class InfoOBJ { } public int getLength() { + if (songs == null) + return 0; return songs.get(0).getLength(); } }