EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 18:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Add enable toggle and per skill thresholds

Browse Source
This commit is contained in:
TfT-02
2014-08-13 09:25:19 -06:00
committed by TfT_02
parent ce3463ad6d
commit 62a767db89
5 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
View File

@ -180,7 +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 getDiminishedReturnsThreshold() { return config.getInt("Diminished_Returns.Threshold", 20000); }
public boolean getDiminishedReturnsEnabled() { return config.getBoolean("Diminished_Returns.Enabled", false); }
public int getDiminishedReturnsThreshold(SkillType skill) { return config.getInt("Diminished_Returns.Threshold." + StringUtils.getCapitalized(skill.toString()), 20000); }
public int getDiminishedReturnsTimeInterval() { return config.getInt("Diminished_Returns.Time_Interval", 10); }
/* Conversion */

4
src/main/java/com/gmail/nossr50/listeners/SelfListener.java
View File

@ -44,7 +44,8 @@ public class SelfListener implements Listener {
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold();
SkillType skillType = event.getSkill();
int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(skillType);
if (threshold <= 0) {
// Diminished returns is turned off
@ -59,7 +60,6 @@ public class SelfListener implements Listener {
Player player = event.getPlayer();
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
SkillType skillType = event.getSkill();
if (skillType.isChildSkill()) {
return;

2
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -496,7 +496,7 @@ public class mcMMO extends JavaPlugin {
}
// Clear the registered XP data so players can earn XP again
if (ExperienceConfig.getInstance().getDiminishedReturnsThreshold() > 0) {
if (ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) {
new ClearRegisteredXPGainTask().runTaskTimer(this, 60, 60);
}
}