From 50bd245a366de12d1d8187d18123b94f534282d9 Mon Sep 17 00:00:00 2001 From: EntityParrot_ Date: Tue, 3 Mar 2020 16:25:00 +0800 Subject: [PATCH] =?UTF-8?q?[VoteUp]=20Bug=20=E4=BF=AE=E5=A4=8D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了一个权限问题。 --- .../sir/voteup/conversation/prompts/CollectReasonPrompt.java | 2 +- .../sir/voteup/conversation/prompts/ModifyContentPrompt.java | 2 +- .../shoal/sir/voteup/conversation/prompts/SetAmountPrompt.java | 2 +- .../shoal/sir/voteup/conversation/prompts/SetChoicePrompt.java | 2 +- .../sir/voteup/conversation/prompts/SetDurationPrompt.java | 2 +- .../shoal/sir/voteup/conversation/prompts/SetResultPormpt.java | 2 +- .../shoal/sir/voteup/conversation/prompts/SetTitlePrompt.java | 2 +- 7 files changed, 7 insertions(+), 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 index 4efe641..f6fdf92 100644 --- 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 index d074fac..1b19790 100644 --- 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 index 408def5..fe63ee2 100644 --- 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 index fce9ad7..7b1e035 100644 --- 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 index fb30bb6..413626c 100644 --- 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 index 3895246..13dd09e 100644 --- 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 index 1614527..9a5d899 100644 --- 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; }