From 8293b1a87942c308df90765933117c5f73a8489d Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sat, 29 Jan 2022 18:43:44 -0600 Subject: [PATCH] bruh --- src/main/java/dev/plex/command/PlexCommand.java | 12 +++++++++--- src/main/java/dev/plex/command/impl/PlexCMD.java | 6 ++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/dev/plex/command/PlexCommand.java b/src/main/java/dev/plex/command/PlexCommand.java index bf03869..cc21a36 100644 --- a/src/main/java/dev/plex/command/PlexCommand.java +++ b/src/main/java/dev/plex/command/PlexCommand.java @@ -165,20 +165,26 @@ public abstract class PlexCommand extends Command audience.sendMessage(component); } - protected void checkRank(Player player, Rank rank, String permission) + protected boolean checkRank(Player player, Rank rank, String permission) { PlexPlayer plexPlayer = getPlexPlayer(player); if (plugin.getRanksOrPermissions().equalsIgnoreCase("ranks")) { - send(player, "test ranks"); + if (!plexPlayer.getRank().equals(rank.toString())) + { + send(player, tl("noPermissionRank", rank.toString())); + return true; + } } else if (plugin.getRanksOrPermissions().equalsIgnoreCase("permissions")) { if (!player.hasPermission(permission)) { - send(player, "test permissions"); + send(player, tl("noPermissionNode", permission)); + return true; } } + return true; } protected boolean isAdmin(PlexPlayer plexPlayer) diff --git a/src/main/java/dev/plex/command/impl/PlexCMD.java b/src/main/java/dev/plex/command/impl/PlexCMD.java index 948d963..f4cdaed 100644 --- a/src/main/java/dev/plex/command/impl/PlexCMD.java +++ b/src/main/java/dev/plex/command/impl/PlexCMD.java @@ -12,6 +12,7 @@ import java.util.List; import net.kyori.adventure.text.Component; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY) @@ -26,10 +27,7 @@ public class PlexCMD extends PlexCommand { } if (args[0].equals("reload")) { - if (!isSeniorAdmin(sender)) - { - return tl("noPermission"); - } + checkRank((Player)sender, Rank.SENIOR_ADMIN, "plex.reload"); Plex.get().config.load(); send(sender, "Reloaded config file"); Plex.get().messages.load();