EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 12:35:27 +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

4
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@@ -1,5 +1,6 @@
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;
@@ -32,6 +33,9 @@ public class AcrobaticsManager extends SkillManager {
public boolean canGainRollXP()
{
if(!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented())
return true;
if(System.currentTimeMillis() >= rollXPCooldown)
{
rollXPCooldown = System.currentTimeMillis() + rollXPInterval;