EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Move Hylian Luck into a separate listener since it actually cancels the

Browse Source 
event.

Priority when cancelling events should not be MONITOR.
This commit is contained in:
GJ
2013-01-23 12:53:12 -05:00
parent aabbc2f238
commit 7919e591cb
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/listeners/BlockListener.java
View File

@ -38,6 +38,7 @@ import com.gmail.nossr50.skills.woodcutting.Woodcutting;
import com.gmail.nossr50.spout.SpoutSounds;
import com.gmail.nossr50.util.BlockChecks;
import com.gmail.nossr50.util.ItemChecks;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.ModChecks;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.Users;
@ -204,16 +205,25 @@ public class BlockListener implements Listener {
}
}
if (Permissions.hylianLuck(player) && ItemChecks.isSword(player.getItemInHand())) {
Herbalism.hylianLuck(block, player, event);
}
//Remove metadata when broken
if (BlockChecks.shouldBeWatched(block)) {
mcMMO.placeStore.setFalse(block);
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockBreakHigher(BlockBreakEvent event) {
Player player = event.getPlayer();
if (Misc.isNPC(player)) {
return;
}
if (Permissions.hylianLuck(player) && ItemChecks.isSword(player.getItemInHand())) {
Herbalism.hylianLuck(event.getBlock(), player, event);
}
}
/**
* Monitor BlockDamage events.
*