bug fix: write mode cannot close GUI

MinecraftProgrammingTeam · Jul 8, 2023 · fd41227 · fd41227
1 parent c996a4b
commit fd41227
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java b/src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java
@@ -12,7 +12,6 @@ public class InvOpen implements Listener {
     public void onInvClicked(InventoryClickEvent event){
         // 防止过分占用服务器资源，因为有的时候会疯狂报错
         if (prize.canPrize){
-
             if (event.getInventory().equals(prize.getTargetPlayer().getInventory())){
                 if (!(event.getCurrentItem() == null)){
                     Player prizePlayer = prize.getPrizePlayer();

diff --git a/src/main/java/top/mpt/huihui/answerit/scheduler/Timer.java b/src/main/java/top/mpt/huihui/answerit/scheduler/Timer.java
@@ -7,6 +7,7 @@
 import top.mpt.huihui.answerit.utils.i18N;
 
 import static top.mpt.huihui.answerit.Main.*;
+import static top.mpt.huihui.answerit.prize.prize.canPrize;
 
 public class Timer extends BukkitRunnable {
 
@@ -26,6 +27,8 @@ public void run() {
         // 清空数组
         voteResult.clear();
         voteList.clear();
+        // 设置可以被奖励
+        canPrize = true;
         ChatUtils.broadcast((String) i18N.getLang("timer.timer_over_summary"), trueCount, falseCount);
         if (trueCount == falseCount){
             ChatUtils.broadcast((String) i18N.getLang("timer.votes_equal"));

diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml
@@ -39,8 +39,8 @@ write:
   vote_right: "#GREEN#[RIGHT]  "
   vote_wrong: "#RED#[WRONG]"
   # broadcast_info
-  server_vote_right_info: "#GREEN#Player: #AQUA#%s #GREEN#vote for Correct"
-  server_vote_wrong_info: "#GREEN#Player: #AQUA#%s #GREEN#vote for Incorrect"
+  server_vote_right_info: "#GREEN#Player: #AQUA#%s #GREEN#vote for #AQUA#RIGHT"
+  server_vote_wrong_info: "#GREEN#Player: #AQUA#%s #GREEN#vote for #RED#WRONG"
   # target_answer
   target_answer_info: "#GREEN#%s 's answer is #AQUA#%s"
 
@@ -49,7 +49,7 @@ timer:
   timer_start_info: "#RED#Timing #AQUA#%d #RED#seconds, now start"
   timer_start_tip: "#RED#Please complete the voting within the specified time."
 
-  timer_over_summary: "#GREEN#Vote closed. %d players vote for RIGHT，%d vote for WRONG"
+  timer_over_summary: "#GREEN#Vote closed. %d players vote for RIGHT, %d vote for WRONG"
   votes_equal: "#GOLD#Equal votes, no reward or punishment for them."
   votes_right: "#GREEN#Answer correct!"
   votes_wrong: "#RED#Answer Incorrect!"
diff --git a/src/main/resources/lang/zh_cn.yml b/src/main/resources/lang/zh_cn.yml
@@ -38,8 +38,8 @@ write:
   vote_right: "#GREEN#[正确]  "
   vote_wrong: "#RED#[错误]"
   # broadcast_info
-  server_vote_right_info: "#GREEN#玩家： #AQUA#%s #GREEN#投给了： 答案正确"
-  server_vote_wrong_info: "#GREEN#玩家： #AQUA#%s #GREEN#投给了： 答案正确"
+  server_vote_right_info: "#GREEN#玩家： #AQUA#%s #GREEN#投给了： #AQUA#答案正确"
+  server_vote_wrong_info: "#GREEN#玩家： #AQUA#%s #GREEN#投给了： #RED#答案错误"
   # target_answer
   target_answer_info: "#GREEN#%s的回答是： #AQUA#%s"