Fix other erroneous exemption checks on commands

NucleusPowered · Sep 25, 2020 · 5742c3d · 5742c3d
1 parent 8c107f4
commit 5742c3d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/changelogs/templates/2.1.3.md b/changelogs/templates/2.1.3.md
@@ -8,4 +8,4 @@ For the things YOU need to do as a server owner, [please visit our instructions
 
 # Bug Fixes
 
-* None yet
+* Fix `/ban`, `/tempban`, `/jail` and `/mute` erroneously telling users that targets were exempt when they were not.
diff --git a/...e/src/main/java/io/github/nucleuspowered/nucleus/modules/ban/commands/TempBanCommand.java b/...e/src/main/java/io/github/nucleuspowered/nucleus/modules/ban/commands/TempBanCommand.java
@@ -66,7 +66,7 @@ public CommandElement[] parameters(INucleusServiceCollection serviceCollection)
         String reason = context.getOne(NucleusParameters.Keys.REASON, String.class)
                 .orElseGet(() -> context.getServiceCollection().messageProvider().getMessageString(context.getCommandSourceUnchecked(), "ban.defaultreason"));
 
-        if (!(context.isConsoleAndBypass() || context.testPermissionFor(u, BanPermissions.TEMPBAN_EXEMPT_TARGET))) {
+        if (!context.isConsoleAndBypass() && context.testPermissionFor(u, BanPermissions.TEMPBAN_EXEMPT_TARGET)) {
             return context.errorResult("command.tempban.exempt", u.getName());
         }
 

diff --git a/...ore/src/main/java/io/github/nucleuspowered/nucleus/modules/jail/commands/JailCommand.java b/...ore/src/main/java/io/github/nucleuspowered/nucleus/modules/jail/commands/JailCommand.java
@@ -93,7 +93,7 @@ public CommandElement[] parameters(INucleusServiceCollection serviceCollection)
             return context.errorResult("command.jail.alreadyjailed", pl.getName());
         }
 
-        if (!context.isConsoleAndBypass() && context.testPermission(JailPermissions.JAIL_EXEMPT_TARGET)) {
+        if (!context.isConsoleAndBypass() && context.testPermissionFor(pl, JailPermissions.JAIL_EXEMPT_TARGET)) {
             return context.errorResult("command.jail.exempt", pl.getName());
         }
 

diff --git a/...ore/src/main/java/io/github/nucleuspowered/nucleus/modules/mute/commands/MuteCommand.java b/...ore/src/main/java/io/github/nucleuspowered/nucleus/modules/mute/commands/MuteCommand.java
@@ -73,7 +73,7 @@ public CommandElement[] parameters(INucleusServiceCollection serviceCollection)
         Optional<MuteData> omd = handler.getPlayerMuteData(user);
         Optional<String> reas = context.getOne(NucleusParameters.Keys.REASON, String.class);
 
-        if (!context.isConsoleAndBypass() && context.testPermission(MutePermissions.MUTE_EXEMPT_TARGET)) {
+        if (!context.isConsoleAndBypass() && context.testPermissionFor(user, MutePermissions.MUTE_EXEMPT_TARGET)) {
             return context.errorResult("command.mute.exempt", user.getName());
         }