diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index bb540a631..e38de8fa9 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -180,8 +180,8 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { public double getCustomXpPerkBoost() { return config.getDouble("Experience_Formula.Custom_XP_Perk.Boost", 1.25); } /* Deminished Returns */ - public int getDeminishedReturnsThreshold() { return config.getInt("Deminished_Returns.Threshold", 20000); } - public int getDeminishedReturnsTimeInterval() { return config.getInt("Deminished_Returns.Time_Interval", 10); } + public int getDiminishedReturnsThreshold() { return config.getInt("Diminished_Returns.Threshold", 20000); } + public int getDiminishedReturnsTimeInterval() { return config.getInt("Diminished_Returns.Time_Interval", 10); } /* Conversion */ public double getExpModifier() { return config.getDouble("Conversion.Exp_Modifier", 1); } diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 660a4c13c..47b91f8f6 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -44,7 +44,7 @@ public class SelfListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onPlayerXpGain(McMMOPlayerXpGainEvent event) { - int threshold = ExperienceConfig.getInstance().getDeminishedReturnsThreshold(); + int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(); if (threshold <= 0) { // Diminished returns is turned off diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 3fab09ce2..2ab2ef28f 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -496,7 +496,7 @@ public class mcMMO extends JavaPlugin { } // Clear the registered XP data so players can earn XP again - if (ExperienceConfig.getInstance().getDeminishedReturnsThreshold() > 0) { + if (ExperienceConfig.getInstance().getDiminishedReturnsThreshold() > 0) { new ClearRegisteredXPGainTask().runTaskTimer(this, 60 * 20, 60 * 20); } } diff --git a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java b/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java index 637b534d6..7c2735f6c 100644 --- a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java @@ -10,7 +10,7 @@ public class ClearRegisteredXPGainTask extends BukkitRunnable { @Override public void run() { for (McMMOPlayer mcMMOPlayer : UserManager.getPlayers()) { - mcMMOPlayer.getProfile().removeXpGainsOlderThan(ExperienceConfig.getInstance().getDeminishedReturnsTimeInterval() * 60 * 1000); + mcMMOPlayer.getProfile().removeXpGainsOlderThan(ExperienceConfig.getInstance().getDiminishedReturnsTimeInterval() * 60 * 1000); } } } diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index dfd1e2a20..b44e1034d 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -60,9 +60,9 @@ Experience_Formula: Boost: 1.25 # -# Settings for Deminished Returns +# Settings for Diminished Returns ### -Deminished_Returns: +Diminished_Returns: # Limit the amount of experience a player can earn: # Threshold (amount of experience) per Time_Interval (in minutes) Threshold: 20000