diff --git a/Changelog.txt b/Changelog.txt index cf587fe7d..9ad1752e9 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,9 @@ Version 2.1.109 + Block Cracker will now correctly crack stone_bricks during Berserk again + Added Lily_Of_The_Valley to the Bonus Drops list in config.yml (you'll probably want to add this manually) which enables it to double drop Added missing 1.14 blocks to ability/tool activation blacklists Fixed spamming of incompatible worldguard version message + Updated Italian locale (thanks Fabrimat) Version 2.1.108 Fixed an amusing exploit for easy leveling in Acrobatics diff --git a/pom.xml b/pom.xml index e0bb54458..c63aa1914 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.109-SNAPSHOT + 2.1.109 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 ebbd20185..e11b6271d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -595,15 +595,15 @@ public class BlockListener implements Listener { } } else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) { - if (SuperAbilityType.BERSERK.blockCheck(block.getState()) && EventUtils.simulateBlockBreak(block, player, true)) { - event.setInstaBreak(true); - SoundManager.sendSound(player, block.getLocation(), SoundType.POP); - } - else if (mcMMOPlayer.getUnarmedManager().canUseBlockCracker() && BlockUtils.affectedByBlockCracker(blockState) && EventUtils.simulateBlockBreak(block, player, true)) { - if (mcMMOPlayer.getUnarmedManager().blockCrackerCheck(blockState)) { + if (mcMMOPlayer.getUnarmedManager().canUseBlockCracker() && BlockUtils.affectedByBlockCracker(blockState)) { + if (EventUtils.simulateBlockBreak(block, player, true) && mcMMOPlayer.getUnarmedManager().blockCrackerCheck(blockState)) { blockState.update(); } } + else if (SuperAbilityType.BERSERK.blockCheck(block.getState()) && EventUtils.simulateBlockBreak(block, player, true)) { + event.setInstaBreak(true); + SoundManager.sendSound(player, block.getLocation(), SoundType.POP); + } } else if (mcMMOPlayer.getWoodcuttingManager().canUseLeafBlower(heldItem) && BlockUtils.isLeaves(blockState) && EventUtils.simulateBlockBreak(block, player, true)) { event.setInstaBreak(true); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4d3d2d47e..3343d0564 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -462,6 +462,7 @@ Bonus_Drops: Lilac: true Rose_Bush: true Peony: true + Lily_Of_The_Valley: true Mining: Andesite: true Diorite: true