From deb3a3bd48d7e59205868291d61a2df945c0de6e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 24 Feb 2012 03:03:19 -0800 Subject: [PATCH] Fixed bug with Leaf Blower & Tree Feller permission nodes --- Changelog.txt | 2 ++ .../java/com/gmail/nossr50/listeners/mcBlockListener.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 2d33c47f9..521070d44 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -18,6 +18,8 @@ Version 1.3.00-dev + Added Fast Food Service subskill to Taming + Added size limit to Tree Feller in config as Tree Feller Threshold + Re-added mcMMO reporting damage events + = Fixed bug where Tree Feller wasn't checking for Tree Feller permission + = Fixed bug where Leaf Blower required Tree Feller permissions rather than Woodcutting permissions = Fixed Leaf Blower preventing the use of shears to collect leaves = Fixed Green Thumb & Green Terra not consuming or requiring seeds to replant Wheat = Fixed Super Breaker & Giga Drill Breaker failing to damage tools diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index a8afbc7fc..eb9488007 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -256,7 +256,7 @@ public class mcBlockListener implements Listener { if(PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block)) Herbalism.greenTerraCheck(player); - if(PP.getAxePreparationMode() && block.getTypeId() == 17) + if(PP.getAxePreparationMode() && block.getTypeId() == 17 && mcPermissions.getInstance().woodCuttingAbility(player)) WoodCutting.treeFellerCheck(player); if(PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) Mining.superBreakerCheck(player); @@ -361,7 +361,7 @@ public class mcBlockListener implements Listener * LEAF BLOWER CHECKS */ if(block.getTypeId() == 18 - && mcPermissions.getInstance().woodCuttingAbility(player) + && mcPermissions.getInstance().woodcutting(player) && PP.getSkillLevel(SkillType.WOODCUTTING) >= 100 && m.blockBreakSimulate(block, player)) {