diff --git a/Changelog.txt b/Changelog.txt index 7cf7351da..ac043fd16 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,6 +9,7 @@ Key: Version 1.3.04-dev = Fixed Shake ability dropping bonemeal instead of ink for squids. + = Fixed Green Terra & Super Breaker awarding 4x drops at high levels. ! Changed MySQL to reload all player information on reconnection Version 1.3.03 diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index a2d7d0af2..8a52ee5e3 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -179,7 +179,6 @@ public class mcBlockListener implements Listener { /* Triple drops */ if (PP.getGreenTerraMode() && Herbalism.canBeGreenTerra(mat)) { Herbalism.herbalismProcCheck(block, player, event, plugin); - Herbalism.herbalismProcCheck(block, player, event, plugin); //Called twice for triple drop functionality } if (mcPermissions.getInstance().herbalismDoubleDrops(player) && Herbalism.canBeGreenTerra(mat)) { diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java index 05fd159ac..3979f7f66 100644 --- a/src/main/java/com/gmail/nossr50/skills/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/Mining.java @@ -165,7 +165,7 @@ public class Mining int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING); - if ((MAX_BONUS_LEVEL > 1000 || (Math.random() * 1000 <= skillLevel)) && mcPermissions.getInstance().miningDoubleDrops(player)) { + if ((skillLevel > MAX_BONUS_LEVEL || (Math.random() * 1000 <= skillLevel)) && mcPermissions.getInstance().miningDoubleDrops(player)) { if (player.getItemInHand().containsEnchantment(Enchantment.SILK_TOUCH)) { m.mcDropItem(block.getLocation(), new ItemStack(block.getType())); } @@ -255,7 +255,6 @@ public class Mining Bukkit.getPluginManager().callEvent(armswing); Skills.abilityDurabilityLoss(player.getItemInHand(), durabilityLoss); - miningBlockCheck(player, block); miningBlockCheck(player, block); if (LoadProperties.spoutEnabled) {