[VoteUp] Bug 修复.

- 修复了一个权限问题。
Polar-Pumpkin · Mar 3, 2020 · 50bd245 · 50bd245
1 parent c71c06a
commit 50bd245
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
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;
         }