diff --git a/build.gradle b/build.gradle index 935084f..c4a7814 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'sh.okx' -version '3.10' +version '3.11-beta.1' repositories { mavenCentral() diff --git a/src/main/java/sh/okx/rankup/RankupPlugin.java b/src/main/java/sh/okx/rankup/RankupPlugin.java index a50ef6e..6cf9f45 100644 --- a/src/main/java/sh/okx/rankup/RankupPlugin.java +++ b/src/main/java/sh/okx/rankup/RankupPlugin.java @@ -138,9 +138,9 @@ public class RankupPlugin extends JavaPlugin { () -> config.getString("confirmation-type", "unknown"))); metrics.addCustomChart(new Metrics.AdvancedPie("requirements", () -> { Map map = new HashMap<>(); - addAll(map, rankups); + addAllRequirements(map, rankups); if (prestiges != null) { - addAll(map, prestiges); + addAllRequirements(map, prestiges); } return map; })); @@ -262,7 +262,7 @@ public class RankupPlugin extends JavaPlugin { return true; } - private void addAll(Map map, RankList ranks) { + private void addAllRequirements(Map map, RankList ranks) { for (Rank rank : ranks.getTree()) { for (Requirement requirement : rank.getRequirements().getRequirements(null)) { String name = requirement.getName(); diff --git a/src/main/java/sh/okx/rankup/commands/InfoCommand.java b/src/main/java/sh/okx/rankup/commands/InfoCommand.java index 0b12c71..dc4413e 100644 --- a/src/main/java/sh/okx/rankup/commands/InfoCommand.java +++ b/src/main/java/sh/okx/rankup/commands/InfoCommand.java @@ -131,7 +131,7 @@ public class InfoCommand implements TabExecutor { } Rank currentRank = currentRankElement.getRank(); - if (plugin.getRankups().getFirst().equals(currentRank)) { + if (currentRankElement.isRootNode()) { sender.sendMessage(ChatColor.YELLOW + "That player is in the first rank and cannot be ranked down."); return true; } diff --git a/src/main/java/sh/okx/rankup/events/PlayerPrestigeEvent.java b/src/main/java/sh/okx/rankup/events/PlayerPrestigeEvent.java index 6dcd4dc..e1d9ac3 100644 --- a/src/main/java/sh/okx/rankup/events/PlayerPrestigeEvent.java +++ b/src/main/java/sh/okx/rankup/events/PlayerPrestigeEvent.java @@ -33,4 +33,8 @@ public class PlayerPrestigeEvent extends PlayerEvent { public HandlerList getHandlers() { return handlers; } + + public static HandlerList getHandlerList() { + return handlers; + } } diff --git a/src/main/java/sh/okx/rankup/events/PlayerRankupEvent.java b/src/main/java/sh/okx/rankup/events/PlayerRankupEvent.java index ea9ac75..b8b0b9e 100644 --- a/src/main/java/sh/okx/rankup/events/PlayerRankupEvent.java +++ b/src/main/java/sh/okx/rankup/events/PlayerRankupEvent.java @@ -33,4 +33,8 @@ public class PlayerRankupEvent extends PlayerEvent { public HandlerList getHandlers() { return handlers; } + + public static HandlerList getHandlerList() { + return handlers; + } }