From ad4ee6f4024e1f8ce1be15c14d4dfceeddb1d17b Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 28 Oct 2013 08:17:06 -0400 Subject: [PATCH] Cleanup exploit prevention method. --- .../skills/acrobatics/AcrobaticsManager.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java index 9f20bdcec..79d11e915 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -28,9 +28,7 @@ public class AcrobaticsManager extends SkillManager { } public boolean canRoll() { - Player player = getPlayer(); - - return !exploitPrevention() && Permissions.roll(player); + return !exploitPrevention() && Permissions.roll(getPlayer()); } public boolean canDodge(Entity damager) { @@ -128,15 +126,7 @@ public class AcrobaticsManager extends SkillManager { public boolean exploitPrevention() { Player player = getPlayer(); - if (player.getItemInHand().getType() == Material.ENDER_PEARL) { - return true; - } - - if (!Config.getInstance().getAcrobaticsAFKDisabled()) { - return false; - } - - if (player.isInsideVehicle()) { + if (player.getItemInHand().getType() == Material.ENDER_PEARL || Config.getInstance().getAcrobaticsAFKDisabled() || player.isInsideVehicle()) { return true; }