From 71141a0f8d073c1a4facf78b733bfb39232192a3 Mon Sep 17 00:00:00 2001 From: GJ Date: Fri, 1 Nov 2013 08:22:04 -0400 Subject: [PATCH] Minimum quantity should default to 2. Fixes #1581 --- .../com/gmail/nossr50/skills/repair/config/RepairConfig.java | 2 +- src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java index 6b4560489..d5fcbcb73 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java @@ -132,7 +132,7 @@ public class RepairConfig extends ConfigLoader { } // Minimum Quantity - int minimumQuantity = (itemMaterial != null && repairMaterial != null ? Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity")); + int minimumQuantity = (itemMaterial != null && repairMaterial != null ? Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity", 2)); if (minimumQuantity <= 0 && itemMaterial != null) { minimumQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial)); diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index 3323a474b..f5afdb122 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -160,7 +160,7 @@ public final class MobHealthbarUtils { * @param livingEntity The {@link LivingEntity} of the livingEntity to check * @return true if the livingEntity is a boss, false otherwise */ - public static boolean isBoss(LivingEntity livingEntity) { + private static boolean isBoss(LivingEntity livingEntity) { switch (livingEntity.getType()) { case ENDER_DRAGON: case WITHER: