Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 11:07:44 +01:00
Code Issues Projects Releases Wiki Activity

.triggerCheck() is only called when it needs to be (NoCheat fix)

Browse Source
This commit is contained in:
nossr50 2012-03-09 16:11:24 -08:00
parent 37b5991dcc
commit 0d14918946
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -229,10 +229,10 @@ public class mcBlockListener implements Listener {
/* /*
* ABILITY TRIGGER CHECKS * ABILITY TRIGGER CHECKS
*/ */
if (Skills.triggerCheck(player, block, AbilityType.GREEN_TERRA)) { if (PP.getGreenTerraMode() && Skills.triggerCheck(player, block, AbilityType.GREEN_TERRA)) {
Herbalism.greenTerra(player, block); Herbalism.greenTerra(player, block);
} }
if (Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) { if (PP.getGigaDrillBreakerMode() && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) { if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
event.setInstaBreak(true); event.setInstaBreak(true);
Excavation.gigaDrillBreaker(player, block); Excavation.gigaDrillBreaker(player, block);
@ -242,7 +242,7 @@ public class mcBlockListener implements Listener {
Excavation.gigaDrillBreaker(player, block); Excavation.gigaDrillBreaker(player, block);
} }
} }
if (Skills.triggerCheck(player, block, AbilityType.BERSERK)) { if (PP.getBerserkMode() && Skills.triggerCheck(player, block, AbilityType.BERSERK)) {
if (inhand.getType().equals(Material.AIR)) { if (inhand.getType().equals(Material.AIR)) {
PlayerAnimationEvent armswing = new PlayerAnimationEvent(player); PlayerAnimationEvent armswing = new PlayerAnimationEvent(player);
Bukkit.getPluginManager().callEvent(armswing); Bukkit.getPluginManager().callEvent(armswing);
@ -254,7 +254,7 @@ public class mcBlockListener implements Listener {
SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation()); SpoutStuff.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
} }
} }
if (Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) { if (PP.getSuperBreakerMode() && Skills.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) { if (LoadProperties.miningrequirespickaxe && ItemChecks.isMiningPick(inhand)) {
event.setInstaBreak(true); event.setInstaBreak(true);
Mining.SuperBreakerBlockCheck(player, block, plugin); Mining.SuperBreakerBlockCheck(player, block, plugin);
@ -264,14 +264,18 @@ public class mcBlockListener implements Listener {
Mining.SuperBreakerBlockCheck(player, block, plugin); Mining.SuperBreakerBlockCheck(player, block, plugin);
} }
} }
if (Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER) && PP.getSkillLevel(SkillType.WOODCUTTING) >= 100) { if (PP.getSkillLevel(SkillType.WOODCUTTING) >= 100 && event.getBlock().getType() == Material.LEAVES) {
if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) { if (LoadProperties.woodcuttingrequiresaxe && ItemChecks.isAxe(inhand)) {
event.setInstaBreak(true); if(Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
WoodCutting.leafBlower(player, block); event.setInstaBreak(true);
WoodCutting.leafBlower(player, block);
}
} }
else if (!LoadProperties.woodcuttingrequiresaxe && !inhand.getType().equals(Material.SHEARS)) { else if (!LoadProperties.woodcuttingrequiresaxe && !inhand.getType().equals(Material.SHEARS)) {
event.setInstaBreak(true); if(Skills.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
WoodCutting.leafBlower(player, block); event.setInstaBreak(true);
WoodCutting.leafBlower(player, block);
}
} }
} }
} }