From ad550759e6009525e70906931da2c2ddb1447f6d Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 8 May 2019 10:24:34 -0700 Subject: [PATCH] Fixed an incredibly rare and difficult to perform dupe bug --- Changelog.txt | 3 +++ pom.xml | 2 +- src/main/java/com/gmail/nossr50/listeners/BlockListener.java | 5 +---- .../java/com/gmail/nossr50/skills/mining/MiningManager.java | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 66f237b68..fa0a8d08d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,6 @@ +Version 2.1.57 + Fixed an incredibly rare dupe bug that only happened with VERY specific config options that was extremely difficult to pull off + Version 2.1.56 Very large update to the zh_CN Chinese language file (thanks Dream_m) diff --git a/pom.xml b/pom.xml index ab11f8c33..961e3a873 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.56 + 2.1.57 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 be401fba7..0b64b488a 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -29,10 +29,7 @@ import com.gmail.nossr50.util.sounds.SoundManager; import com.gmail.nossr50.util.sounds.SoundType; import com.gmail.nossr50.worldguard.WorldGuardManager; import com.gmail.nossr50.worldguard.WorldGuardUtils; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Tag; +import org.bukkit.*; import org.bukkit.block.*; import org.bukkit.entity.Item; import org.bukkit.entity.Player; 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 cbec5563b..0ee620634 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -79,9 +79,8 @@ public class MiningManager extends SkillManager { SkillUtils.handleDurabilityChange(getPlayer().getInventory().getItemInMainHand(), Config.getInstance().getAbilityToolDamage()); } - if ((mcMMO.getModManager().isCustomMiningBlock(blockState) && !mcMMO.getModManager().getBlock(blockState).isDoubleDropEnabled())) { + if(!Config.getInstance().getDoubleDropsEnabled(PrimarySkillType.MINING, blockState.getType())) return; - } boolean silkTouch = player.getInventory().getItemInMainHand().containsEnchantment(Enchantment.SILK_TOUCH);