Many, many bug fixes

- Fix permission checks
- Fix unban command
- getOfflinePlexPlayer no longer uses cache
- Register worlds before trying to load gamerules
- Customizable ban messages
This commit is contained in:
2022-01-30 14:56:08 -06:00
parent bb978f2ab4
commit d4761d4386
12 changed files with 74 additions and 50 deletions

View File

@ -167,6 +167,16 @@ public abstract class PlexCommand extends Command
audience.sendMessage(component);
}
protected boolean checkRank(CommandSender sender, Rank rank, String permission)
{
if (!isConsole(sender))
{
checkRank((Player)sender, rank, permission);
return true;
}
return true;
}
protected boolean checkRank(Player player, Rank rank, String permission)
{
PlexPlayer plexPlayer = getPlexPlayer(player);
@ -174,16 +184,14 @@ public abstract class PlexCommand extends Command
{
if (!plexPlayer.getRank().equals(rank.toString()))
{
send(player, tl("noPermissionRank", rank.toString()));
return true;
throw new CommandFailException(PlexUtils.tl("noPermissionRank", ChatColor.stripColor(rank.getLoginMSG())));
}
}
else if (plugin.getRanksOrPermissions().equalsIgnoreCase("permissions"))
{
if (!player.hasPermission(permission))
{
send(player, tl("noPermissionNode", permission));
return true;
throw new CommandFailException(PlexUtils.tl("noPermissionNode", permission));
}
}
return true;
@ -268,7 +276,7 @@ public abstract class PlexCommand extends Command
protected PlexPlayer getOfflinePlexPlayer(UUID uuid)
{
PlexPlayer plexPlayer = PlayerCache.getPlexPlayer(uuid);
PlexPlayer plexPlayer = DataUtils.getPlayer(uuid);
if (plexPlayer == null)
{
throw new PlayerNotFoundException();