From f5f4182a9043b88d613ae29abb5cfab152bd67e9 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 10 Jun 2019 16:14:24 -0700 Subject: [PATCH] 2.1.75 --- Changelog.txt | 3 +++ pom.xml | 2 +- src/main/java/com/gmail/nossr50/listeners/BlockListener.java | 5 +++-- .../java/com/gmail/nossr50/skills/mining/MiningManager.java | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 0c2a607a2..741ebd72e 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.75 + Fixed a bug that prevented Fortune from working correctly if a Double Drop was triggered + Version 2.1.74 Fixed a NPE that could occur during certain events if a skill was disabled in coreskills.yml (Sorry!) diff --git a/pom.xml b/pom.xml index cfcf23d48..70d2fdafb 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.74 + 2.1.75 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index eef643ec5..d9b8361cf 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -76,10 +76,11 @@ public class BlockListener implements Listener { for (int i = 0; i < bonusCount; i++) { event.getBlock().getWorld().dropItemNaturally(event.getBlockState().getLocation(), is); } - - event.getBlock().removeMetadata(mcMMO.BONUS_DROPS_METAKEY, plugin); } } + + if(event.getBlock().hasMetadata(mcMMO.BONUS_DROPS_METAKEY)) + event.getBlock().removeMetadata(mcMMO.BONUS_DROPS_METAKEY, plugin); } /*@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java index 0ee620634..d5ddc13c7 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -73,8 +73,6 @@ public class MiningManager extends SkillManager { return; } - Material material = blockState.getType(); - if (mcMMOPlayer.getAbilityMode(skill.getAbility())) { SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage()); }