Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ protected void execute(CommandEvent event, Player player) {

String rankString;
{
Rank highRank = RankUtil.getHighRank(set);
Rank[] ranks = RankUtil.getRanks(set);
Rank highRank = RankUtil.getHighRank(ranks);
if (highRank == null) {
rankString = "";
} else {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public enum Rank {
RETIRED("Retired", 1, RankBranch.RETIREMENT, "Retired"),
EMERITUS("Emeritus", 2, RankBranch.RETIREMENT, "Emeritus"),
//Special
VIP("VIP", 1, RankBranch.VIP, "VIP"),
BUILDER("B", 1, RankBranch.BUILDER, "Builder"),
YOUTUBER("YT", 1, RankBranch.YOUTUBER, "Youtube"),
// Support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

public enum RankBranch {
DONOR,
VIP,
RETIREMENT,
BUILDER,
YOUTUBER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static Rank[] getRanks(ResultSet set) {
} catch (SQLException ignored) {
}

return ranks.toArray(Rank[]::new);
return ranks.stream().sorted(Comparator.comparingInt(Enum::ordinal)).toArray(Rank[]::new);
}

public static Rank getHighRank(ResultSet set) {
Expand Down