From 39343922191f911191d02d9d88b2a0dec24d51a1 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 14 Aug 2012 13:52:31 -0700 Subject: [PATCH] Did somebody say HOTFIX? --- Changelog.txt | 5 ++++- pom.xml | 2 +- .../java/com/gmail/nossr50/skills/gathering/Excavation.java | 2 +- src/main/java/com/gmail/nossr50/skills/gathering/Mining.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 98799473e..7222883f3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -6,7 +6,10 @@ Key: = Fix ! Change - Removal - + +Version 1.3.11 + = Fixed bug where mcMMO would ignore other block-protection plugins for various abilities + Version 1.3.10 + Added 1.3.1 compatibility + Added permission node for Iron Grip ability (mcmmo.ability.unarmed.irongrip) diff --git a/pom.xml b/pom.xml index 70620a25b..ba404472b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 1.3.10 + 1.3.11 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java index 8b475aa11..3020a24c8 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Excavation.java @@ -124,7 +124,7 @@ public class Excavation { public static void gigaDrillBreaker(Player player, Block block) { Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage()); - if (!mcMMO.placeStore.isTrue(block)) { + if (!mcMMO.placeStore.isTrue(block) || !Misc.blockBreakSimulate(block, player, true)) { FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player); mcMMO.p.getServer().getPluginManager().callEvent(armswing); diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java index 7b813c730..eed34200b 100644 --- a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java @@ -340,7 +340,7 @@ public class Mining { return; } - if (mcMMO.placeStore.isTrue(block)) { + if (mcMMO.placeStore.isTrue(block) || Misc.blockBreakSimulate(block, player, true)) { return; }