Multi QA Supported

xiaohuihui1022 · xiaohuihui1022 · commit 63b7da4aab26 · 2023-08-23T20:55:17.000+08:00
diff --git a/src/main/java/top/mpt/huihui/answerit/Main.java b/src/main/java/top/mpt/huihui/answerit/Main.java
@@ -1,6 +1,5 @@
 package top.mpt.huihui.answerit;
 
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -18,7 +17,10 @@
 import static org.bukkit.ChatColor.BLUE;
 
 public final class Main extends JavaPlugin {
-
+    // 负责记录正在进行问答的玩家们
+    public static List<Player> playersOnQuestioning = new ArrayList<>();
+    // 负责记录Tokens
+    public static List<String> tokens = new ArrayList<>();
     // log用
     public static Main instance;
     /* Write */
diff --git a/src/main/java/top/mpt/huihui/answerit/commands/impl/q.java b/src/main/java/top/mpt/huihui/answerit/commands/impl/q.java
@@ -5,7 +5,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import top.mpt.huihui.answerit.Main;
 import top.mpt.huihui.answerit.commands.ICommand;
 import top.mpt.huihui.answerit.prize.prize;
 import top.mpt.huihui.answerit.utils.ChatUtils;
@@ -40,6 +39,7 @@ public boolean onCommand(CommandSender sender, String[] args) {
         // 判断玩家是不是人
         if (sender instanceof Player){
             q.sender = (Player)sender;
+
             // ClickEvent用
             TextComponent message = null;
             // 防止index out of range
@@ -51,11 +51,19 @@ public boolean onCommand(CommandSender sender, String[] args) {
             // 接收问答的人
             // 给event传参用
             target = Bukkit.getPlayer(args[0]);
+            // 判断target
             if (target == null){
                 PlayerUtils.send(sender, i18N.getLang("player_err"));
                 return true;
             }
-
+            // 如果服务器上正在发生提问
+            if (playersOnQuestioning.contains(target)){
+                PlayerUtils.send(q.sender, i18N.getLang("please_wait_err"));
+                return true;
+            }
+            // 默认玩家已经开始了询问，不管是select还是write
+            playersOnQuestioning.add(q.sender);
+            playersOnQuestioning.add(target);
             if (Objects.equals(args[2], "select") || Objects.equals(args[2], "Select")){
                 // 给玩家发送消息
                 PlayerUtils.send(sender, i18N.getLang("select.player_choose_answer"));
@@ -114,6 +122,7 @@ public boolean onCommand(CommandSender sender, String[] args) {
             }
 
         } else {
+            // 如果都不是，就给玩家发送错误消息
             sender.sendMessage((String) i18N.getLang("sender_err"));
         }
         return true;
diff --git a/src/main/java/top/mpt/huihui/answerit/commands/impl/reload.java b/src/main/java/top/mpt/huihui/answerit/commands/impl/reload.java
@@ -24,6 +24,10 @@ public boolean onCommand(CommandSender sender, String[] args) {
         config = YamlConfiguration.loadConfiguration(file);
         i18N.setYaml(config);
 
+        // 结束提问
+        tokens.clear();
+        playersOnQuestioning.clear();
+
         Online_Players.clear();
         Bukkit.getOnlinePlayers().forEach( it -> Online_Players.add(it.getName()) );
 
diff --git a/src/main/java/top/mpt/huihui/answerit/commands/impl/send.java b/src/main/java/top/mpt/huihui/answerit/commands/impl/send.java
@@ -9,8 +9,6 @@
 import top.mpt.huihui.answerit.utils.PlayerUtils;
 import top.mpt.huihui.answerit.utils.i18N;
 
-import java.util.Objects;
-
 import static top.mpt.huihui.answerit.Main.*;
 
 public class send extends ICommand {
@@ -22,6 +20,7 @@ public send(){
     public boolean onCommand(CommandSender sender, String[] args){
         // args[0] == 答对啦！
         // args[1] == NameFlying(提问者)
+        // args[2] == token
         if (sender instanceof Player){
             if (!prize.canPrize){
                 PlayerUtils.send(sender, i18N.getLang("global.player_cant_answer"));
@@ -30,14 +29,19 @@ public boolean onCommand(CommandSender sender, String[] args){
             if (args.length != 3){
                 PlayerUtils.send(sender, i18N.getLang("global.command_err_format"));
                 return true;
-            } if (!args[2].equals(setAnswer.token)){ // 检验token
+            }
+            if (!tokens.contains(args[2])){ // 检验token
                 PlayerUtils.send(sender, "#RED#Token error.");
             } else if (args[0].equals("答对啦！")){
+                // 移除使用过的token
+                tokens.remove(args[2]);
                 ChatUtils.broadcast((String) i18N.getLang("select.target_choose_right_answer"), sender.getName(), args[1]);
                 prize.setPrizePlayer((Player) sender);
                 prize.setTargetPlayer(Bukkit.getPlayer(args[1]));
                 prize.executePrize();
             } else if (args[0].equals("答错了！")){
+                // 移除使用过的token
+                tokens.remove(args[2]);
                 ChatUtils.broadcast((String) i18N.getLang("select.target_choose_wrong_answer"), sender.getName(), args[1]);
                 prize.setTargetPlayer((Player) sender);
                 prize.setPrizePlayer(Bukkit.getPlayer(args[1]));
diff --git a/src/main/java/top/mpt/huihui/answerit/commands/impl/setAnswer.java b/src/main/java/top/mpt/huihui/answerit/commands/impl/setAnswer.java
@@ -10,6 +10,8 @@
 import top.mpt.huihui.answerit.utils.PlayerUtils;
 import top.mpt.huihui.answerit.utils.i18N;
 
+import static top.mpt.huihui.answerit.Main.*;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
@@ -112,10 +114,13 @@ public static String getRandomString(int length){
         String str="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
         Random random = new Random();
         StringBuffer sb = new StringBuffer();
-        for(int i=0; i<length; i++){
-            int number=random.nextInt(62);
+        for(int i = 0; i < length; i++){
+            int number = random.nextInt(62);
             sb.append(str.charAt(number));
         }
+        // put tokens into a List
+        tokens.add(sb.toString());
+        // return it
         return sb.toString();
     }
 }
diff --git a/src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java b/src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java
@@ -6,6 +6,8 @@
 import org.bukkit.entity.Player;
 import top.mpt.huihui.answerit.prize.prize;
 
+import static top.mpt.huihui.answerit.Main.playersOnQuestioning;
+
 public class InvOpen implements Listener {
     /* from prize.prize */
     @EventHandler
@@ -22,8 +24,15 @@ public void onInvClicked(InventoryClickEvent event){
                     targetPlayer.getInventory().remove(event.getCurrentItem());
                     // 关闭inventory
                     prizePlayer.closeInventory();
+                    // 奖励结束，移除玩家
+                    // 防止玩家因为sb腐竹reload而插件报错无法获取奖励
+                    if (playersOnQuestioning.contains(prizePlayer) && playersOnQuestioning.contains(targetPlayer)){
+                        playersOnQuestioning.remove(prizePlayer);
+                        playersOnQuestioning.remove(targetPlayer);
+                    }
                     // 结束奖励
                     prize.clearAllPlayer();
+
                     /* to the end of this(select / write) process */
                 }
 
diff --git a/src/main/java/top/mpt/huihui/answerit/prize/prize.java b/src/main/java/top/mpt/huihui/answerit/prize/prize.java
@@ -65,6 +65,7 @@ public static void clearAllPlayer(){
      * 默认为打开对方背包并且可以拿取任意一个物品
      */
     public static void executePrize(){
+        // 执行奖励
         prizePlayer.openInventory(targetPlayer.getInventory());
         /* to listener.InvOpen */
     }
diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml
@@ -7,6 +7,8 @@ sender_err: "Please let players execute this command!"
 mode_err: "#RED#Mode is wrong, please ask %s to check about."
 player_err: "#RED#Cannot find players who named that. Or maybe the player isn't online."
 
+please_wait_err: "#AQUA#Someone is already in Q&A. To prevent any bugs, please wait for them to complete the Q&A before asking any questions to someone."
+
 tab_tips:
   input_question: "Please enter the question here"
   input_answer: "Please enter the answer here (one answer per space)"
diff --git a/src/main/resources/lang/zh_cn.yml b/src/main/resources/lang/zh_cn.yml
@@ -6,6 +6,8 @@ sender_err: "请让玩家执行指令！"
 mode_err: "#RED#提问类型有误，请让%s检查一下。"
 player_err: "#RED#找不到玩家或玩家不在线"
 
+please_wait_err: "#AQUA#此玩家正在进行问答操作，为了防止出现bug，请等待他们完成问答后在进行提问。"
+
 tab_tips:
   input_question: "请在这里输入问题(带问号)"
   input_answer: "请在这里输入答案(每个空格为1个答案)"

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ public static void clearAllPlayer(){`
`65`	`65`	`* 默认为打开对方背包并且可以拿取任意一个物品`
`66`	`66`	`*/`
`67`	`67`	`public static void executePrize(){`
	`68`	`+ // 执行奖励`
`68`	`69`	`prizePlayer.openInventory(targetPlayer.getInventory());`
`69`	`70`	`/* to listener.InvOpen */`
`70`	`71`	`}`