EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the possibility to use some abilities without the proper tool

Browse Source
This commit is contained in:
bm01 2012-07-02 21:29:25 +02:00
parent 819b6fcacb
commit 87f59cd3eb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,10 +305,12 @@ public class BlockListener implements Listener {
Herbalism.greenTerra(player, block); Herbalism.greenTerra(player, block);
} }
else if (PP.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) { else if (PP.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
if (configInstance.getExcavationRequiresTool() && ItemChecks.isShovel(inHand)) { if (configInstance.getExcavationRequiresTool()) {
if (ItemChecks.isShovel(inHand)) {
event.setInstaBreak(true); event.setInstaBreak(true);
Excavation.gigaDrillBreaker(player, block); Excavation.gigaDrillBreaker(player, block);
} }
}
else { else {
event.setInstaBreak(true); event.setInstaBreak(true);
Excavation.gigaDrillBreaker(player, block); Excavation.gigaDrillBreaker(player, block);
@ -327,10 +329,12 @@ public class BlockListener implements Listener {
} }
} }
else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) { else if (PP.getAbilityMode(AbilityType.SUPER_BREAKER) && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
if (configInstance.getMiningRequiresTool() && ItemChecks.isPickaxe(inHand)) { if (configInstance.getMiningRequiresTool()) {
if (ItemChecks.isPickaxe(inHand)) {
event.setInstaBreak(true); event.setInstaBreak(true);
Mining.superBreakerBlockCheck(player, block); Mining.superBreakerBlockCheck(player, block);
} }
}
else { else {
event.setInstaBreak(true); event.setInstaBreak(true);
Mining.superBreakerBlockCheck(player, block); Mining.superBreakerBlockCheck(player, block);