Fixed issues with Hylian Luck & the placed-block flag.

This commit is contained in:
GJ 2013-01-23 13:06:13 -05:00
parent 7919e591cb
commit 56d27c3d78
2 changed files with 5 additions and 2 deletions

View File

@ -15,6 +15,8 @@ Version 1.4.00-dev
= Fixed bug where Impact improperly determined the defender's armor = Fixed bug where Impact improperly determined the defender's armor
= Fixed ArrayIndexOutOfBoundsException resulting from being unranked in a skill when using FlatFile = Fixed ArrayIndexOutOfBoundsException resulting from being unranked in a skill when using FlatFile
= Fixed Woodcutting accidentally using Mining double drop values. = Fixed Woodcutting accidentally using Mining double drop values.
= Fixed Hylian Luck not removing the block-placed flag from flowers.
= Fixed Hylian Luck not checking the block-placed flag on flowers.
! Moved Hylian Luck into a separate listener since it actually cancels the event and shouldn't just be on MONITOR. ! Moved Hylian Luck into a separate listener since it actually cancels the event and shouldn't just be on MONITOR.
! Changed how Tree Feller is handled, it should now put less stress on the CPU ! Changed how Tree Feller is handled, it should now put less stress on the CPU
! Changed Fisherman's Diet and Farmer's Diet to use two seperate config values ! Changed Fisherman's Diet and Farmer's Diet to use two seperate config values

View File

@ -214,13 +214,14 @@ public class BlockListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockBreakHigher(BlockBreakEvent event) { public void onBlockBreakHigher(BlockBreakEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
Block block = event.getBlock();
if (Misc.isNPC(player)) { if (Misc.isNPC(player)) {
return; return;
} }
if (Permissions.hylianLuck(player) && ItemChecks.isSword(player.getItemInHand())) { if (Permissions.hylianLuck(player) && ItemChecks.isSword(player.getItemInHand()) && !mcMMO.placeStore.isTrue(block)) {
Herbalism.hylianLuck(event.getBlock(), player, event); Herbalism.hylianLuck(block, player, event);
} }
} }