EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 13:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Fixing merge conflicts

Browse Source
This commit is contained in:
nossr50
2019-04-03 17:25:18 -07:00
parent 7bbf1acd5d b68feb6992
commit 8991c2bf2c
15 changed files with 710 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -424,7 +424,6 @@ public abstract class Config implements VersionedConfig, Unload {
{
return userRootNode.getNode(path).getInt();
}
/**
* Grabs a double from the specified node
* @param path

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

@ -226,6 +226,9 @@ public class ExperienceConfig extends ConfigValidated {
return getBooleanValue(EXPLOIT_FIX, ENDERMAN_ENDERMITE_FARMS);
}
/* public boolean isFishingExploitingPrevented() { return config.getBoolean("ExploitFix.Fishing", true); }
public boolean isAcrobaticsExploitingPrevented() { return config.getBoolean("ExploitFix.Acrobatics", true); }*/
/* Curve settings */
public FormulaType getFormulaType() {
return FormulaType.getFormulaType(getStringValue(EXPERIENCE_FORMULA, CURVE));