Bug fix: Inventory error & added tips

Author: xiaohuihui1022

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>top.mpt.huihui</groupId>
     <artifactId>answerit</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.41-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Answerit</name>

src/main/java/top/mpt/huihui/answerit/commands/impl/send.java

@@ -22,7 +22,6 @@ public send(){
     public boolean onCommand(CommandSender sender, String[] args){
         // args[0] == 答对啦！
         // args[1] == NameFlying(提问者)
-        System.out.println(prize.canPrize);
         if (sender instanceof Player){
             if (!prize.canPrize){
                 PlayerUtils.send(sender, i18N.getLang("global.player_cant_answer"));

src/main/java/top/mpt/huihui/answerit/commands/impl/setAnswer.java

@@ -39,7 +39,9 @@ public boolean onCommand(CommandSender sender, String[] args){
             target = Bukkit.getPlayer(args[0]);
             answer = args[1];
             answerText = args[4];
-            // 发送消息
+            // 给发送问题方发送消息
+            PlayerUtils.send(sender, i18N.getLang("select.player_send_question"));
+            // 给接收问题方发送消息
             sendQuestion(((Player) sender).getPlayer(), args[2], args[3]);
         } else {
             sender.sendMessage((String) i18N.getLang("sender_err"));

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

@@ -10,18 +10,26 @@ public class InvOpen implements Listener {
     /* from prize.prize */
     @EventHandler
     public void onInvClicked(InventoryClickEvent event){
-        if (event.getInventory().equals(prize.getTargetPlayer().getInventory())){
-            Player prizePlayer = prize.getPrizePlayer();
-            Player targetPlayer = prize.getTargetPlayer();
-            // 添加物品
-            prizePlayer.getInventory().addItem(event.getCurrentItem());
-            // 移除物品
-            targetPlayer.getInventory().remove(event.getCurrentItem());
-            // 关闭inventory
-            prizePlayer.closeInventory();
-            // 结束奖励
-            prize.clearAllPlayer();
-            /* to the end of this(select / write) process */
+        // 防止过分占用服务器资源，因为有的时候会疯狂报错
+        if (prize.canPrize){
+
+            if (event.getInventory().equals(prize.getTargetPlayer().getInventory())){
+                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();
+                    // 结束奖励
+                    prize.clearAllPlayer();
+                    /* to the end of this(select / write) process */
+                }
+
+            }
+
         }
     }
 }

src/main/resources/lang/en_us.yml

@@ -22,6 +22,7 @@ global:
   command_err_format: "#AQUA#The format you entered is incorrect!"
 
 select:
+  player_send_question: "#AQUA#The target has received your question, please be patient and wait for his or her answer."
   player_choose_answer: "#AQUA#Please select an answer: "
   # broadcast_info
   target_choose_right_answer: "#GOLD#Player: #AQUA#%s #GOLD#answered #BLUE#%s 's #GOLD#question correctly."

src/main/resources/lang/zh_cn.yml

@@ -21,6 +21,7 @@ global:
   command_err_format: "#AQUA#您输入的格式并不正确！"
 
 select:
+  player_send_question: "#AQUA#对方已收到您的问题，请耐心等待对方回答。"
   player_choose_answer: "#AQUA#请选择一个正确答案： "
   # broadcast_info
   target_choose_right_answer: "#GOLD#玩家： #AQUA#%s #GOLD#答对了 #BLUE#%s #GOLD#的问题。"