From cdb5fed5a5308b2303f64f3e1421222761da509c Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Mon, 24 Dec 2012 13:00:50 +0100 Subject: [PATCH] Changed bonus to float Fixes bug where only 1 diamond was needed to fully repair an almost broken diamond pickaxe --- src/main/java/com/gmail/nossr50/mcMMO.java | 2 -- src/main/java/com/gmail/nossr50/skills/repair/Repair.java | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 849ccada0..53bb4f5a7 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -14,8 +14,6 @@ import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitScheduler; -import org.bukkit.World; - import com.gmail.nossr50.commands.general.AddlevelsCommand; import com.gmail.nossr50.commands.general.AddxpCommand; import com.gmail.nossr50.commands.general.InspectCommand; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java index 87ac93bdf..eeedf2e9b 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java @@ -210,12 +210,12 @@ public class Repair { * @return The final amount of durability repaired to the item */ protected static short repairCalculate(Player player, int skillLevel, short durability, int repairAmount) { - double bonus; - if(skillLevel >= repairMasteryMaxBonusLevel) bonus = (double) repairMasteryChanceMax; - else bonus = ((double) skillLevel / (double) repairMasteryMaxBonusLevel) * (double) repairMasteryChanceMax; + float bonus; + if(skillLevel >= repairMasteryMaxBonusLevel) bonus = repairMasteryChanceMax; + else bonus = (skillLevel / repairMasteryMaxBonusLevel) * repairMasteryChanceMax; if (permInstance.repairMastery(player)) { - bonus = ((double) repairAmount * bonus); + bonus = (repairAmount * bonus); repairAmount += (int) bonus; }