[VoteUp] Bug 修复.

- 修复了上次更改投票ID格式留下的后遗症。
Polar-Pumpkin · Mar 3, 2020 · f04976f · f04976f
1 parent 30c2989
commit f04976f
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 10 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.shoal.sir</groupId>
     <artifactId>VoteUp</artifactId>
-    <version>1.4.2-RELEASE</version>
+    <version>1.4.3-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>VoteUp</name>

diff --git a/src/main/java/net/shoal/sir/voteup/config/CacheManager.java b/src/main/java/net/shoal/sir/voteup/config/CacheManager.java
@@ -81,7 +81,7 @@ public void report(CacheLogType type, Player user) {
 
             List<String> targetVoteList = new ArrayList<>();
             for(String voteID : voteIDList) {
-                String[] dataSet = voteID.split(".");
+                String[] dataSet = voteID.split("_");
                 if (dataSet.length < 2) {
                     continue;
                 }

diff --git a/src/main/java/net/shoal/sir/voteup/config/VoteManager.java b/src/main/java/net/shoal/sir/voteup/config/VoteManager.java
@@ -243,7 +243,7 @@ public void vote(String voteID, Player user, String reason, ChoiceType type) {
                         save(vote.data());
                         CommonUtil.message(locale.getMessage(VoteUp.LOCALE, MessageType.INFO, "Vote", "Vote." + type.toString()), user.getName());
 
-                        Player starter = Bukkit.getPlayerExact(voteID.split("//.")[0]);
+                        Player starter = Bukkit.getPlayerExact(voteID.split("_")[0]);
                         if(starter != null && starter.isOnline()) {
                             String noticeMsg = locale.getMessage(VoteUp.LOCALE, MessageType.INFO, "Vote", "Voted.Starter")
                                     .replace("%Voter%", user.getName())

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/CollectReasonPrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/CollectReasonPrompt.java
@@ -36,7 +36,7 @@ public String getPromptText(ConversationContext context) {
     public Prompt acceptInput(ConversationContext context, String input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/ModifyContentPrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/ModifyContentPrompt.java
@@ -58,7 +58,7 @@ protected Prompt acceptValidatedInput(ConversationContext context, String input)
 
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetAmountPrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetAmountPrompt.java
@@ -28,7 +28,7 @@ public SetAmountPrompt(Player player) {
     protected Prompt acceptValidatedInput(ConversationContext context, Number input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetChoicePrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetChoicePrompt.java
@@ -40,7 +40,7 @@ public String getPromptText(ConversationContext context) {
     public Prompt acceptInput(ConversationContext context, String input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetDurationPrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetDurationPrompt.java
@@ -45,7 +45,7 @@ protected boolean isInputValid(ConversationContext context, String input) {
     protected Prompt acceptValidatedInput(ConversationContext context, String input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetResultPormpt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetResultPormpt.java
@@ -37,7 +37,7 @@ public String getPromptText(ConversationContext context) {
     public Prompt acceptInput(ConversationContext context, String input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }

diff --git a/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetTitlePrompt.java b/src/main/java/net/shoal/sir/voteup/conversation/prompts/SetTitlePrompt.java
@@ -34,7 +34,7 @@ public String getPromptText(ConversationContext context) {
     public Prompt acceptInput(ConversationContext context, String input) {
         locale = VoteUp.getInstance().getLocale();
 
-        if(!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("//.")[0].equalsIgnoreCase(user.getName())) {
+        if (!user.hasPermission(VoteUpPerm.ADMIN.perm()) || !voteID.split("_")[0].equalsIgnoreCase(user.getName())) {
             CommonUtil.message(locale.buildMessage(VoteUp.LOCALE, MessageType.WARN, "&7权限验证失败, 您不具有修改目标投票内容的权限."), user.getName());
             return Prompt.END_OF_CONVERSATION;
         }