From 29f2525b58b7d1bf82e707f7b24f13879996a91d Mon Sep 17 00:00:00 2001
From: t00thpick1 <t00thpick1dirko@gmail.com>
Date: Sun, 10 Nov 2013 13:54:45 -0500
Subject: [PATCH] Tend toward the smaller values, and configurable maximum for
 horse jump strength

---
 src/main/java/com/gmail/nossr50/config/AdvancedConfig.java   | 5 +++++
 .../java/com/gmail/nossr50/skills/taming/TamingManager.java  | 3 ++-
 src/main/resources/advanced.yml                              | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
index 12ad6e5d8..685d0a1a9 100644
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -526,6 +526,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Taming.SharpenedClaws.Bonus should be at least 1!");
         }
 
+        if (getMaxHorseJumpStrength() < 0 || getMaxHorseJumpStrength() > 2) {
+            reason.add("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength should be between 0 and 2!");
+        }
 
         /* UNARMED */
         if (getDisarmChanceMax() < 1) {
@@ -764,6 +767,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws.UnlockLevel", 750); }
     public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws.Bonus", 2.0D); }
 
+    public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }
+
     /* UNARMED */
     public double getDisarmChanceMax() { return config.getDouble("Skills.Unarmed.Disarm.ChanceMax", 33.0D); }
     public int getDisarmMaxBonusLevel() { return config.getInt("Skills.Unarmed.Disarm.MaxBonusLevel", 1000); }
diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
index 2710328d2..18455c8ff 100644
--- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
@@ -11,6 +11,7 @@ import org.bukkit.entity.Wolf;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
@@ -240,7 +241,7 @@ public class TamingManager extends SkillManager {
                     entity.setHealth(entity.getMaxHealth());
                     horse.setColor(Horse.Color.values()[Misc.getRandom().nextInt(Horse.Color.values().length)]);
                     horse.setStyle(Horse.Style.values()[Misc.getRandom().nextInt(Horse.Style.values().length)]);
-                    horse.setJumpStrength(Misc.getRandom().nextDouble() * 2);
+                    horse.setJumpStrength(Math.min(Math.min(Misc.getRandom().nextDouble(), Misc.getRandom().nextDouble()) * 2, AdvancedConfig.getInstance().getMaxHorseJumpStrength());
                     //TODO: setSpeed, once available
                     break;
 
diff --git a/src/main/resources/advanced.yml b/src/main/resources/advanced.yml
index e02d05923..0b55f2367 100644
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -447,6 +447,10 @@ Skills:
             # Bonus: This bonus will get added to the damage caused
             UnlockLevel: 750
             Bonus: 2.0
+
+        CallOfTheWild:
+            # MaxHorseJumpStrength: The maximum jump strength a summoned horse can have
+            MaxHorseJumpStrength: 2.0
     #
     #  Settings for Unarmed
     ###