cdanesi/Rankup3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.4.2-beta

Browse Source
This commit is contained in:
okx-code
2019-02-07 20:15:35 +00:00
parent 3682cd6150
commit aacd06b43e
5 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/sh/okx/rankup/RankList.java
+2 -3
View File
@@ -59,7 +59,7 @@ public class RankList<T extends Rank> {
return rank;
}
}
return null;
throw new RuntimeException("Invalid rank: " + name);
}
public T getByPlayer(Player player) {
@@ -83,7 +83,6 @@ public class RankList<T extends Rank> {
return nextRank;
}
}
// this shouldn't happen but whatever
return null;
throw new RuntimeException(rank.getName() + " has an invalid next rank");
}
}
src/main/java/sh/okx/rankup/Rankup.java
+5 -28
View File
@@ -13,11 +13,7 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.InventoryView;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin;
import sh.okx.rankup.commands.InfoCommand;
import sh.okx.rankup.commands.PrestigeCommand;
import sh.okx.rankup.commands.PrestigesCommand;
import sh.okx.rankup.commands.RanksCommand;
import sh.okx.rankup.commands.RankupCommand;
import sh.okx.rankup.commands.*;
import sh.okx.rankup.gui.Gui;
import sh.okx.rankup.gui.GuiListener;
import sh.okx.rankup.messages.EmptyMessageBuilder;
@@ -32,21 +28,11 @@ import sh.okx.rankup.ranks.Rankups;
import sh.okx.rankup.requirements.OperationRegistry;
import sh.okx.rankup.requirements.Requirement;
import sh.okx.rankup.requirements.RequirementRegistry;
import sh.okx.rankup.requirements.operation.AllOperation;
import sh.okx.rankup.requirements.operation.AnyOperation;
import sh.okx.rankup.requirements.operation.NoneOperation;
import sh.okx.rankup.requirements.operation.OneOperation;
import sh.okx.rankup.requirements.requirement.GroupRequirement;
import sh.okx.rankup.requirements.requirement.MoneyRequirement;
import sh.okx.rankup.requirements.requirement.PermissionRequirement;
import sh.okx.rankup.requirements.requirement.PlaceholderRequirement;
import sh.okx.rankup.requirements.requirement.PlaytimeMinutesRequirement;
import sh.okx.rankup.requirements.operation.*;
import sh.okx.rankup.requirements.requirement.*;
import sh.okx.rankup.requirements.requirement.XpLevelRequirement;
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsAchievementRequirement;
import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsTotalRequirement;
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement;
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement;
import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillUtil;
import sh.okx.rankup.requirements.requirement.advancedachievements.*;
import sh.okx.rankup.requirements.requirement.mcmmo.*;
import java.io.File;
import java.text.DecimalFormat;
@@ -363,15 +349,6 @@ public class Rankup extends JavaPlugin {
.send(player);
return false;
} else if (rank.isLast()) { // check if they are at the highest rank
// if(prestiges != null) {
// Prestige prestige = prestiges.getByPlayer(player);
// if(prestige.isLast()) {
// getMessage(rank, Message.NO_RANKUP)
// .failIf(!message)
// .replaceRanks(player, prestige)
// .send(player);
// }
// }
getMessage(rank, prestiges == null ? Message.NO_RANKUP : prestiges.getByPlayer(player).isLast() ? Message.NO_RANKUP : Message.MUST_PRESTIGE)
.failIf(!message)
.replaceRanks(player, rank)