Fix rankup and prestige events
This commit is contained in:
@@ -138,9 +138,9 @@ public class RankupPlugin extends JavaPlugin {
|
||||
() -> config.getString("confirmation-type", "unknown")));
|
||||
metrics.addCustomChart(new Metrics.AdvancedPie("requirements", () -> {
|
||||
Map<String, Integer> 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<String, Integer> map, RankList<? extends Rank> ranks) {
|
||||
private void addAllRequirements(Map<String, Integer> map, RankList<? extends Rank> ranks) {
|
||||
for (Rank rank : ranks.getTree()) {
|
||||
for (Requirement requirement : rank.getRequirements().getRequirements(null)) {
|
||||
String name = requirement.getName();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -33,4 +33,8 @@ public class PlayerPrestigeEvent extends PlayerEvent {
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,4 +33,8 @@ public class PlayerRankupEvent extends PlayerEvent {
|
||||
public HandlerList getHandlers() {
|
||||
return handlers;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList() {
|
||||
return handlers;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user