bug

server/src/main/java/com/coloryr/allmusic/server/core/command/sub/CommandVote.java

@@ -34,7 +34,7 @@ public class CommandVote extends ACommand {
                     return;
                 }
                 PlayMusic.removeVote(name, VoteItem.VoteType.NEXT);
-                AllMusic.side.sendMessage(sender, AllMusic.getMessage().push.cancel1);
+                AllMusic.side.sendMessage(sender, AllMusic.getMessage().vote.cancel2);
             } else {
                 AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error);
             }

server/src/main/java/com/coloryr/allmusic/server/core/music/PlayMusic.java

@@ -130,7 +130,6 @@ public class PlayMusic {
         }
 
         voteList.add(vote);
-        voteTime = AllMusic.getConfig().vote.voteTime;
 
         return true;
     }
@@ -164,6 +163,9 @@ public class PlayMusic {
                     playList.add(0, obj);
                 }
                 AllMusic.side.broadcastInTask(AllMusic.getMessage().push.doPush);
+            } else {
+                // 投票期间这首歌被删了，别静默丢弃
+                AllMusic.side.broadcastInTask(AllMusic.getMessage().push.err4);
             }
         }
 
@@ -233,6 +235,12 @@ public class PlayMusic {
      */
     public static VoteItem nextVote() {
         vote = voteList.poll();
+        if (vote != null) {
+            // 计时要在真正开始（成为当前投票）时重置：
+            // 原来在 startVote 里重置，排队中的投票会沿用上一票剩下的时间，
+            // 而且运行中再发起新投票会把当前投票的时间也重置掉
+            voteTime = AllMusic.getConfig().vote.voteTime;
+        }
         return vote;
     }
 

server/src/main/java/com/coloryr/allmusic/server/core/objs/message/PushObj.java

@@ -80,7 +80,7 @@ public class PushObj {
         if (err4 == null)
             err4 = "<light_purple>[AllMusic]<red>切歌投票跳过不存在的音乐投票";
         if (err5 == null)
-            err5 = "<light_purple>[AllMusic]<red>你已经申请过插歌了，不能再继续申请";
+            err5 = "<light_purple>[AllMusic]<red>这首歌已经有进行中的插歌投票了";
         if (cancel == null)
             cancel = "<light_purple>[AllMusic]<yellow>插歌投票已被发起者取消";
         if (cancel1 == null)

server/src/main/java/com/coloryr/allmusic/server/core/objs/message/VoteObj.java

@@ -17,6 +17,7 @@ public class VoteObj {
     public String err6;
     public String cancel;
     public String cancel1;
+    public String cancel2;
     public String list;
 
     public static VoteObj make() {
@@ -57,6 +58,8 @@ public class VoteObj {
             return true;
         if (cancel1 == null)
             return true;
+        if (cancel2 == null)
+            return true;
         if (list == null)
             return true;
         return next == null;
@@ -95,6 +98,8 @@ public class VoteObj {
             cancel = "<light_purple>[AllMusic]<yellow>切歌投票已被发起者取消";
         if (cancel1 == null)
             cancel1 = "<light_purple>[AllMusic]<yellow>歌曲结束，切歌投票终止";
+        if (cancel2 == null)
+            cancel2 = "<light_purple>[AllMusic]<yellow>已取消你发起的切歌投票";
         if (list == null)
             list = "<light_purple>[AllMusic]<yellow>剩余" + ARG.count + "个投票";
     }