From 08c4e1c225622d14ad373153c4a081db029a3d1a Mon Sep 17 00:00:00 2001 From: okx-code Date: Sat, 12 Oct 2019 12:00:14 +0100 Subject: [PATCH] 3.5.8 --- build.gradle | 2 +- .../AdvancedAchievementsAchievementRequirement.java | 5 +++++ .../AdvancedAchievementsTotalRequirement.java | 2 +- .../requirement/tokenmanager/TokensRequirement.java | 7 +++++-- src/main/resources/config.yml | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0768f0d..0f79edc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'sh.okx' -version '3.5.8-beta' +version '3.5.8' repositories { mavenCentral() diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsAchievementRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsAchievementRequirement.java index 8dc87d9..05b8bde 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsAchievementRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsAchievementRequirement.java @@ -26,6 +26,11 @@ public class AdvancedAchievementsAchievementRequirement extends Requirement { return super.getFullName() + "#" + getValueString(); } + @Override + public double getTotal(Player player) { + return 1; + } + @Override public Requirement clone() { return new AdvancedAchievementsAchievementRequirement(this); diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsTotalRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsTotalRequirement.java index d69b783..9345947 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsTotalRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/advancedachievements/AdvancedAchievementsTotalRequirement.java @@ -11,7 +11,7 @@ public class AdvancedAchievementsTotalRequirement extends ProgressiveRequirement super(plugin, "advancedachievements-total"); } - protected AdvancedAchievementsTotalRequirement(Requirement clone) { + private AdvancedAchievementsTotalRequirement(Requirement clone) { super(clone); } diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/tokenmanager/TokensRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/tokenmanager/TokensRequirement.java index ed460e9..e1fef2c 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/tokenmanager/TokensRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/tokenmanager/TokensRequirement.java @@ -6,15 +6,18 @@ import org.bukkit.entity.Player; import sh.okx.rankup.Rankup; import sh.okx.rankup.requirements.DeductibleRequirement; import sh.okx.rankup.requirements.ProgressiveRequirement; +import sh.okx.rankup.requirements.Requirement; + +import java.util.Objects; public class TokensRequirement extends ProgressiveRequirement implements DeductibleRequirement { - private final TokenManager manager = (TokenManager) Bukkit.getPluginManager().getPlugin("TokenManager"); + private final TokenManager manager = (TokenManager) Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("TokenManager")); public TokensRequirement(Rankup plugin) { super(plugin, "tokenmanager-tokens"); } - private TokensRequirement(TokensRequirement clone) { + private TokensRequirement(Requirement clone) { super(clone); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0a976ce..aea7970 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -23,6 +23,7 @@ prestiges: true # whether or not /prestige and /prestiges should be enabled. # you can alternatively negate the permission rankup.prestige # this will also make the command not autocomplete in 1.13 +# if enabled, a prestiges.yml file will be generated with some example prestiges prestige: false # how people should confirm ranking up