Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 11:07:44 +01:00
Code Issues Projects Releases Wiki Activity

Minimum quantity should default to 2.

Browse Source 
Fixes #1581
This commit is contained in:
GJ 2013-11-01 08:22:04 -04:00
parent bded936af5
commit 71141a0f8d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java
View File

@ -132,7 +132,7 @@ public class RepairConfig extends ConfigLoader {
} }
// Minimum Quantity // 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) { if (minimumQuantity <= 0 && itemMaterial != null) {
minimumQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial)); minimumQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial));

2
src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java
View File

@ -160,7 +160,7 @@ public final class MobHealthbarUtils {
* @param livingEntity The {@link LivingEntity} of the livingEntity to check * @param livingEntity The {@link LivingEntity} of the livingEntity to check
* @return true if the livingEntity is a boss, false otherwise * @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()) { switch (livingEntity.getType()) {
case ENDER_DRAGON: case ENDER_DRAGON:
case WITHER: case WITHER: