EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-31 11:35:28 +02:00
Code Issues Projects Releases Wiki Activity

Merge master 2.1.40

Browse Source
This commit is contained in:
nossr50
2019-04-11 04:43:59 -07:00
parent de3e2b79f7 00cc5f0845
commit 1fe4fef75a
9 changed files with 94 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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.datatypes.LimitedSizeList;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -15,6 +16,7 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.skills.RankUtils;
import com.gmail.nossr50.util.skills.SkillActivationType;
import com.gmail.nossr50.util.skills.SkillUtils;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@@ -23,11 +25,26 @@ public class AcrobaticsManager extends SkillManager {
public AcrobaticsManager(McMMOPlayer mcMMOPlayer) {
super(mcMMOPlayer, PrimarySkillType.ACROBATICS);
rollXPInterval = (1000 * mcMMO.getConfigManager().getConfigExploitPrevention().getConfigSectionExploitAcrobatics().getRollXPGainCooldownSeconds());
//Save some memory if exploit prevention is off
if(mcMMO.getConfigManager().getConfigExploitPrevention().getConfigSectionExploitAcrobatics().isPreventAcrobaticsAbuse())
fallLocationMap = new LimitedSizeList(mcMMO.getConfigManager().getConfigExploitPrevention().getAcrobaticLocationLimit());
}
private long rollXPCooldown = 0;
private long rollXPInterval;
private long rollXPIntervalLengthen = (1000 * 10); //10 Seconds
private LimitedSizeList fallLocationMap;
public boolean hasFallenInLocationBefore(Location location)
{
return fallLocationMap.contains(location);
}
public void addLocationToFallMap(Location location)
{
fallLocationMap.add(location);
}
public boolean canGainRollXP()
{