Bug Fix

Author: xiaohuihui1022

src/main/java/top/mpt/huihui/answerit/Main.java

@@ -1,11 +1,13 @@
 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;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import top.mpt.huihui.answerit.executor.CommandHandler;
+import top.mpt.huihui.answerit.listener.InvClose;
 import top.mpt.huihui.answerit.listener.InvOpen;
 import top.mpt.huihui.answerit.listener.PlayerChat;
 import top.mpt.huihui.answerit.listener.PlayerJoinAndQuit;
@@ -49,8 +51,7 @@ public void onEnable() {
         getConfig().options().copyDefaults();
         saveDefaultConfig();
 
-
-
+        Bukkit.getOnlinePlayers().forEach(it -> Online_Players.add(it.getName()) );
 
         File file = new File(getDataFolder() + "/lang/", getConfig().getString("lang"));
         saveResource("lang/zh_cn.yml", false);
@@ -63,6 +64,7 @@ public void onEnable() {
         // 注册事件
         getServer().getPluginManager().registerEvents(new PlayerChat(), this);
         getServer().getPluginManager().registerEvents(new InvOpen(), this);
+        getServer().getPluginManager().registerEvents(new InvClose(), this);
         getServer().getPluginManager().registerEvents(new PlayerJoinAndQuit(), this);
         getLogger().info(normal + ChatColor.AQUA + "Plugin Enabled");
         /* wait player's commands */

src/main/java/top/mpt/huihui/answerit/listener/InvClose.java

@@ -0,0 +1,30 @@
+package top.mpt.huihui.answerit.listener;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import top.mpt.huihui.answerit.prize.prize;
+import top.mpt.huihui.answerit.utils.PlayerUtils;
+import top.mpt.huihui.answerit.utils.i18N;
+
+import static top.mpt.huihui.answerit.Main.playersOnQuestioning;
+
+public class InvClose implements Listener{
+    @EventHandler
+    public void onInvClose(InventoryCloseEvent event){
+        if (prize.canPrize){
+            if (event.getPlayer().equals(prize.getPrizePlayer())){
+                Player prizePlayer = prize.getPrizePlayer();
+                Player targetPlayer = prize.getTargetPlayer();
+                // 奖励结束，移除玩家
+                if (playersOnQuestioning.contains(prizePlayer) && playersOnQuestioning.contains(targetPlayer)){
+                    playersOnQuestioning.remove(prizePlayer);
+                    playersOnQuestioning.remove(targetPlayer);
+                }
+                PlayerUtils.send(prize.getPrizePlayer(), i18N.getLang("global.inv_closed"));
+                prize.clearAllPlayer();
+            }
+        }
+    }
+}

src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java

@@ -2,9 +2,12 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.entity.Player;
 import top.mpt.huihui.answerit.prize.prize;
+import top.mpt.huihui.answerit.utils.ChatUtils;
+import top.mpt.huihui.answerit.utils.PlayerUtils;
 
 import static top.mpt.huihui.answerit.Main.playersOnQuestioning;
 
@@ -15,29 +18,19 @@ public void onInvClicked(InventoryClickEvent event){
         // 防止过分占用服务器资源，因为有的时候会疯狂报错
         if (prize.canPrize){
             if (event.getInventory().equals(prize.getTargetPlayer().getInventory())){
+                Player prizePlayer = prize.getPrizePlayer();
+                Player targetPlayer = prize.getTargetPlayer();
                 if (event.getCurrentItem() != null){
-                    Player prizePlayer = prize.getPrizePlayer();
-                    Player targetPlayer = prize.getTargetPlayer();
                     // 添加物品
                     prizePlayer.getInventory().addItem(event.getCurrentItem());
                     // 移除物品
                     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 */
                 }
-
             }
-
         }
     }
 }

src/main/java/top/mpt/huihui/answerit/prize/prize.java

@@ -1,6 +1,11 @@
 package top.mpt.huihui.answerit.prize;
 
 import org.bukkit.entity.Player;
+import top.mpt.huihui.answerit.utils.ChatUtils;
+import top.mpt.huihui.answerit.utils.PlayerUtils;
+import top.mpt.huihui.answerit.utils.i18N;
+
+import static top.mpt.huihui.answerit.Main.playersOnQuestioning;
 
 /**
  * 奖罚系统
@@ -65,8 +70,20 @@ public static void clearAllPlayer(){
      * 默认为打开对方背包并且可以拿取任意一个物品
      */
     public static void executePrize(){
-        // 执行奖励
-        prizePlayer.openInventory(targetPlayer.getInventory());
-        /* to listener.InvOpen */
+        if (prizePlayer.getName().equals(targetPlayer.getName())){
+            PlayerUtils.send(prizePlayer, i18N.getLang("self_err"));
+            PlayerUtils.send(prizePlayer, i18N.getLang("global.inv_closed"));
+            // 结束奖励 //
+            // 移除两次是因为这不是集合是数组 //
+            playersOnQuestioning.remove(prizePlayer);
+            playersOnQuestioning.remove(targetPlayer);
+            clearAllPlayer();
+        }
+        else {
+            // 执行奖励
+            prizePlayer.openInventory(targetPlayer.getInventory());
+            /* to listener.InvOpen */
+        }
+
     }
 }

src/main/resources/lang/en_us.yml

@@ -6,6 +6,7 @@
 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."
+self_err: "#RED#Why would you asked yourself a question and answered it?"
 
 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."
 
@@ -26,6 +27,7 @@ global:
 
   player_cant_answer: "#RED#You cannot answer it again!!!"
   command_err_format: "#AQUA#The format you entered is incorrect!"
+  inv_closed: "#AQUA#This Q&A operation has ended."
 
 select:
   player_send_question: "#AQUA#The target has received your question, please be patient and wait for his or her answer."

src/main/resources/lang/zh_cn.yml

@@ -5,6 +5,7 @@
 sender_err: "请让玩家执行指令！"
 mode_err: "#RED#提问类型有误，请让%s检查一下。"
 player_err: "#RED#找不到玩家或玩家不在线"
+self_err: "#RED#你何必自己提问自己呢？"
 
 please_wait_err: "#AQUA#此玩家正在进行问答操作，为了防止出现bug，请等待他们完成问答后在进行提问。"
 
@@ -25,6 +26,7 @@ global:
 
   player_cant_answer: "#RED#想啥呢？答完题了还想再答是吧？？？给爷爬！！！"
   command_err_format: "#AQUA#您输入的格式并不正确！"
+  inv_closed: "#AQUA#本次问答操作已结束。"
 
 select:
   player_send_question: "#AQUA#对方已收到您的问题，请耐心等待对方回答。"