EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Add missing party chat permission check to the party chat command

Browse Source
This commit is contained in:
nossr50 2020-10-29 12:20:52 -07:00
parent ca93dc02df
commit 4bac586253
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/commands/CommandManager.java
View File

@ -11,6 +11,7 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.Permissions; import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.player.UserManager;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.Permissible;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/* /*
@ -32,6 +33,11 @@ public class CommandManager {
registerCommands(); registerCommands();
} }
private void registerCommands() {
bukkitCommandManager.registerCommand(new AdminChatCommand(pluginRef));
bukkitCommandManager.registerCommand(new PartyChatCommand(pluginRef));
}
public void registerConditions() { public void registerConditions() {
// Method or Class based - Can only be used on methods // Method or Class based - Can only be used on methods
bukkitCommandManager.getCommandConditions().addCondition(ADMIN_CONDITION, (context) -> { bukkitCommandManager.getCommandConditions().addCondition(ADMIN_CONDITION, (context) -> {
@ -56,13 +62,15 @@ public class CommandManager {
if(bukkitCommandIssuer.getIssuer() instanceof Player) { if(bukkitCommandIssuer.getIssuer() instanceof Player) {
validateLoadedData(bukkitCommandIssuer.getPlayer()); validateLoadedData(bukkitCommandIssuer.getPlayer());
validatePlayerParty(bukkitCommandIssuer.getPlayer()); validatePlayerParty(bukkitCommandIssuer.getPlayer());
validatePermission("mcmmo.chat.partychat", bukkitCommandIssuer.getPlayer());
} }
}); });
} }
private void registerCommands() { private void validatePermission(@NotNull String permissionNode, @NotNull Permissible permissible) {
bukkitCommandManager.registerCommand(new AdminChatCommand(pluginRef)); if(!permissible.hasPermission(permissionNode)) {
bukkitCommandManager.registerCommand(new PartyChatCommand(pluginRef)); throw new ConditionFailedException("You do not have the appropriate permission to use this command.");
}
} }