From be792a1052e522fc57e51a4e8c6c4e0bfd3ec8cc Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Mon, 28 Oct 2013 15:39:47 +0100 Subject: [PATCH] Fix exploitPrevention() and add Javadocs --- src/main/java/com/gmail/nossr50/config/Config.java | 4 ++-- .../nossr50/skills/acrobatics/AcrobaticsManager.java | 12 +++++++++++- .../nossr50/skills/herbalism/HerbalismManager.java | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 1eab5ba52..aedda4fa3 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -429,9 +429,9 @@ public class Config extends AutoUpdateConfigLoader { public boolean getJungleDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Jungle", true); } /* AFK Leveling */ - public boolean getAcrobaticsAFKDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); } + public boolean getAcrobaticsPreventAFK() { return config.getBoolean("Skills.Acrobatics.Prevent_AFK_Leveling", true); } public int getAcrobaticsAFKMaxTries() { return config.getInt("Skills.Acrobatics.Max_Tries_At_Same_Location", 3); } - public boolean getHerbalismAFKDisabled() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); } + public boolean getHerbalismPreventAFK() { return config.getBoolean("Skills.Herbalism.Prevent_AFK_Leveling", true); } /* Level Caps */ public int getPowerLevelCap() { 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 79d11e915..a6c141195 100644 --- a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java @@ -123,10 +123,20 @@ public class AcrobaticsManager extends SkillManager { return damage; } + /** + * Check if the player is "farming" Acrobatics XP using + * exploits in the game. + * + * @return true if exploits are detected, false otherwise + */ public boolean exploitPrevention() { + if (!Config.getInstance().getAcrobaticsPreventAFK()) { + return false; + } + Player player = getPlayer(); - if (player.getItemInHand().getType() == Material.ENDER_PEARL || Config.getInstance().getAcrobaticsAFKDisabled() || player.isInsideVehicle()) { + if (player.getItemInHand().getType() == Material.ENDER_PEARL || player.isInsideVehicle()) { return true; } diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index 45768c98b..3ed5b50f7 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -43,7 +43,7 @@ public class HerbalismManager extends SkillManager { } public boolean canBlockCheck() { - return !(Config.getInstance().getHerbalismAFKDisabled() && getPlayer().isInsideVehicle()); + return !(Config.getInstance().getHerbalismPreventAFK() && getPlayer().isInsideVehicle()); } public boolean canGreenThumbBlock(BlockState blockState) {