EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 07:06:45 +01:00
Code Issues Projects Releases Wiki Activity

We can move this check to exploitPrevention()

Browse Source
This commit is contained in:
TfT_02 2013-10-26 00:50:31 +02:00
parent 8aac6a992b
commit 49a5bd2ba6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ public class AcrobaticsManager extends SkillManager {
public boolean canRoll() { public boolean canRoll() {
Player player = getPlayer(); Player player = getPlayer();
return (player.getItemInHand().getType() != Material.ENDER_PEARL) && !exploitPrevention() && Permissions.roll(player); return !exploitPrevention() && Permissions.roll(player);
} }
public boolean canDodge(Entity damager) { public boolean canDodge(Entity damager) {
@ -126,15 +126,21 @@ public class AcrobaticsManager extends SkillManager {
} }
public boolean exploitPrevention() { public boolean exploitPrevention() {
Player player = getPlayer();
if (player.getItemInHand().getType() == Material.ENDER_PEARL) {
return true;
}
if (!Config.getInstance().getAcrobaticsAFKDisabled()) { if (!Config.getInstance().getAcrobaticsAFKDisabled()) {
return false; return false;
} }
if (getPlayer().isInsideVehicle()) { if (player.isInsideVehicle()) {
return true; return true;
} }
Location fallLocation = getPlayer().getLocation(); Location fallLocation = player.getLocation();
boolean sameLocation = (lastFallLocation != null && Misc.isNear(lastFallLocation, fallLocation, 2)); boolean sameLocation = (lastFallLocation != null && Misc.isNear(lastFallLocation, fallLocation, 2));