This commit is contained in:
Coloryr committed 2020-03-10 22:54:23 +08:00
1 parent 32cebbb1a9
commit b2c187355f
4 files changed
+11 -9

No files matched your search

@@ -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没有播放的玩家");
@@ -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) {
@@ -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();
@@ -39,6 +39,8 @@ public class InfoOBJ {
}
public int getLength() {
if (songs == null)
return 0;
return songs.get(0).getLength();
}
}