From c01b8e4ad4fa003c5ab0af327447f5598b022508 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 19 Mar 2019 12:31:38 -0700
Subject: [PATCH] Update changelog

---
 Changelog.txt                                    |  2 +-
 .../com/gmail/nossr50/config/MainConfig.java     | 16 ----------------
 .../skills/subskills/acrobatics/Roll.java        |  5 -----
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 8e52d104e..303ce0f00 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -131,7 +131,7 @@ Version 2.2.0
     removed the hardcore and vampirism commands, these are dangerous settings and should not be toggle-able (turn them on in your configs if you want to use them)
 
     Removed the following config settings from various configs for doing nothing
-    Update_Check, Prefer_Beta
+    Update_Check, Prefer_Beta, Ability_Activation_Level_Gate, Max_Tries_At_Same_Location, Prevent_AFK_Leveling, Items_Pickup_Disabled_Full_Inventory
 
     Removed the following config settings for being unwanted
     Config_Update_Overwrite, Tool_Mods_Enabled, Armor_Mods_Enabled, Block_Mods_Enabled, Entity_Mods_Enabled
diff --git a/src/main/java/com/gmail/nossr50/config/MainConfig.java b/src/main/java/com/gmail/nossr50/config/MainConfig.java
index 051b7456b..3a7cdcae3 100644
--- a/src/main/java/com/gmail/nossr50/config/MainConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/MainConfig.java
@@ -584,10 +584,6 @@ public class MainConfig extends ConfigValidated {
         return getBooleanValue(SKILLS, ACROBATICS, PREVENT + DODGE + LIGHTNING);
     }
 
-    public int getXPAfterTeleportCooldown() {
-        return getIntValue(SKILLS, ACROBATICS, XP_AFTER_TELEPORT + COOLDOWN);
-    }
-
     /* Alchemy */
     public boolean getEnabledForHoppers() {
         return getBooleanValue(SKILLS, ALCHEMY, ENABLED + FOR_HOPPERS);
@@ -673,10 +669,6 @@ public class MainConfig extends ConfigValidated {
         return getBooleanValue(SKILLS, UNARMED, BLOCK_CRACKER, SMOOTH_BRICK_TO_CRACKED_BRICK);
     }
 
-    public boolean getUnarmedItemPickupDisabled() {
-        return getBooleanValue(SKILLS, UNARMED, ITEM + PICKUP_DISABLED_FULL_INVENTORY);
-    }
-
     public boolean getUnarmedItemsAsUnarmed() {
         return getBooleanValue(SKILLS, UNARMED, ITEMS + AS + UNARMED);
     }
@@ -716,14 +708,6 @@ public class MainConfig extends ConfigValidated {
     }
 
     /* AFK Leveling */
-    public boolean getAcrobaticsPreventAFK() {
-        return getBooleanValue(SKILLS, ACROBATICS, PREVENT_AFK + LEVELING);
-    }
-
-    public int getAcrobaticsAFKMaxTries() {
-        return getIntValue(SKILLS, ACROBATICS, MAX_TRIES_AT_SAME_LOCATION);
-    }
-
     public boolean getHerbalismPreventAFK() {
         return getBooleanValue(SKILLS, HERBALISM, PREVENT_AFK + LEVELING);
     }
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
index 7777c3bad..91ca7ed17 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java
@@ -1,7 +1,6 @@
 package com.gmail.nossr50.datatypes.skills.subskills.acrobatics;
 
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.LimitedSizeList;
 import com.gmail.nossr50.datatypes.experience.XPGainReason;
@@ -277,10 +276,6 @@ public class Roll extends AcrobaticsSubSkill {
      * @return true if exploits are detected, false otherwise
      */
     private boolean isExploiting(Player player) {
-        if (!MainConfig.getInstance().getAcrobaticsPreventAFK()) {
-            return false;
-        }
-
         if (player.getInventory().getItemInMainHand().getType() == Material.ENDER_PEARL || player.isInsideVehicle()) {
             return true;
         }