From 68eb51a3d0dc1c0d0e447801f9ecf46deff891ae Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Mon, 30 Sep 2013 23:43:19 +0200
Subject: [PATCH] Removed Shake_UnlockLevel config option

because it is no longer needed.
---
 Changelog.txt                                                | 1 +
 .../com/gmail/nossr50/commands/skills/FishingCommand.java    | 2 +-
 src/main/java/com/gmail/nossr50/config/AdvancedConfig.java   | 5 -----
 .../com/gmail/nossr50/skills/fishing/FishingManager.java     | 2 +-
 src/main/resources/advanced.yml                              | 3 ---
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index ed60b8d23..d4e488168 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -67,6 +67,7 @@ Version 1.4.07-dev
  ! Mob healthbars are automatically disabled when the plugin "HealthBar" is found
  - The /mmoupdate command has been removed. It is replaced by /mcconvert database
  - Removed Abilities.Tools.Durability_Loss_Enabled, set Abilities.Tools.Durability_Loss to 0 to disable instead.
+ - Removed Skills.Fishing.Shake_UnlockLevel from advanced.yml, now using Skills.Fishing.Rank_Levels.Rank_1 instead.
  - Removed SpoutPlugin support
 
 Version 1.4.06
diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
index 740ff1dce..81176a0e8 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -143,7 +143,7 @@ public class FishingCommand extends SkillCommand {
         }
 
         if (canShake) {
-            int unlockLevel = AdvancedConfig.getInstance().getShakeUnlockLevel();
+            int unlockLevel = AdvancedConfig.getInstance().getFishingTierLevelsTier1();
 
             if (skillValue < unlockLevel) {
                 player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Fishing.Ability.Locked.0", unlockLevel)));
diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 9015dcfd7..74577697c 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -213,10 +213,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Fishing.Ice_Fishing_UnlockLevel should be at least 1!");
         }
 
-        if (getShakeUnlockLevel() < 1) {
-            reason.add("Skills.Fishing.Shake_UnlockLevel should be at least 1!");
-        }
-
         if (getShakeChanceRank1() > getShakeChanceRank2()) {
             reason.add("Skills.Fishing.Shake_Chance.Rank_1 should be less or equal to Skills.Fishing.Shake_Chance.Rank_2!");
         }
@@ -979,7 +975,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getIceFishingUnlockLevel() { return config.getInt("Skills.Fishing.Ice_Fishing_UnlockLevel", 50); }
 
     /* Shake */
-    public int getShakeUnlockLevel() { return config.getInt("Skills.Fishing.Shake_UnlockLevel", 150); }
     public double getShakeChanceRank1() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_1", 25.0D); }
     public double getShakeChanceRank2() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_2", 25.0D); }
     public double getShakeChanceRank3() { return config.getDouble("Skills.Fishing.Shake_Chance.Rank_3", 35.0D); }
diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
index d135469f3..a10c06d54 100644
--- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
@@ -68,7 +68,7 @@ public class FishingManager extends SkillManager {
     }
 
     public boolean canShake(Entity target) {
-        return target instanceof LivingEntity && getSkillLevel() >= AdvancedConfig.getInstance().getShakeUnlockLevel() && Permissions.shake(getPlayer());
+        return target instanceof LivingEntity && getSkillLevel() >= AdvancedConfig.getInstance().getFishingTierLevelsTier1() && Permissions.shake(getPlayer());
     }
 
     public boolean canMasterAngler() {
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index 6c20fdb31..90bba77a6 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -116,9 +116,6 @@ Skills:
     #  Settings for Fishing
     ###
     Fishing:
-        # Shake_UnlockLevel: Fishing level when the Shake ability unlocks
-        Shake_UnlockLevel: 150
-
         # Rank_Levels: Fishing level where rank gets unlocked
         Rank_Levels:
             Rank_1: 125