From 0203f05ad03f00f513a7c5d841f5a3da67ce0b14 Mon Sep 17 00:00:00 2001 From: Business Goose Date: Mon, 28 Mar 2022 17:59:14 +0100 Subject: [PATCH] Make the isSeniorAdmin() check the rank of Discord Command Senders since they're always verified --- .../StevenLawson/TotalFreedomMod/admin/AdminList.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/admin/AdminList.java b/src/main/java/me/StevenLawson/TotalFreedomMod/admin/AdminList.java index 5fc5143..c9dc8fa 100644 --- a/src/main/java/me/StevenLawson/TotalFreedomMod/admin/AdminList.java +++ b/src/main/java/me/StevenLawson/TotalFreedomMod/admin/AdminList.java @@ -9,6 +9,8 @@ import me.StevenLawson.TotalFreedomMod.config.Configuration; import me.StevenLawson.TotalFreedomMod.config.ConfigurationEntry; import me.StevenLawson.TotalFreedomMod.config.MainConfig; import me.StevenLawson.TotalFreedomMod.deprecated.twitter.TwitterHandler; +import me.StevenLawson.TotalFreedomMod.discord.sender.DiscordCommandSender; +import me.StevenLawson.TotalFreedomMod.player.PlayerRank; import me.StevenLawson.TotalFreedomMod.player.UUIDManager; import me.StevenLawson.TotalFreedomMod.util.Utilities; import me.StevenLawson.TotalFreedomMod.world.AdminWorld; @@ -481,6 +483,14 @@ public class AdminList || (MainConfig.getBoolean(ConfigurationEntry.CONSOLE_IS_SENIOR) && sender.getName().equals("CONSOLE")); } + if(sender instanceof DiscordCommandSender) { + PlayerRank rank = PlayerRank.fromSender(sender); + + if(rank.equals(PlayerRank.SENIOR)) { + return true; + } + } + final Admin entry = getEntry((Player) sender); if (entry != null) {