Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable

# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
This commit is contained in:
nossr50
2019-04-09 14:38:49 -07:00
10 changed files with 13 additions and 14 deletions

View File

@@ -1,6 +1,5 @@
package com.gmail.nossr50.skills.acrobatics;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -28,7 +27,7 @@ public class AcrobaticsManager extends SkillManager {
}
private long rollXPCooldown = 0;
private long rollXPInterval; //1 Minute
private long rollXPInterval;
private long rollXPIntervalLengthen = (1000 * 10); //10 Seconds
public boolean canGainRollXP()