From 132388fe3f2b48975616c440f1b456f5ec1f1c09 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Fri, 9 Mar 2012 18:27:03 -0500
Subject: [PATCH] Fix for stuff not breaking right.

Still an issue with Herbalism & Green Terra, though.
---
 .../java/com/gmail/nossr50/listeners/mcBlockListener.java | 8 ++++----
 .../com/gmail/nossr50/listeners/mcEntityListener.java     | 2 --
 src/main/java/com/gmail/nossr50/skills/Skills.java        | 7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 41f53dcbc..8413e110a 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -207,16 +207,16 @@ public class mcBlockListener implements Listener {
             if (PP.getHoePreparationMode() && Herbalism.canBeGreenTerra(block)) {
                 Skills.abilityCheck(player, SkillType.HERBALISM);
             }
-            if (PP.getAxePreparationMode() && mat.equals(Material.LOG) && mcPermissions.getInstance().woodCuttingAbility(player)) {  //Why are we checking the permissions here?
+            else if (PP.getAxePreparationMode() && mat.equals(Material.LOG) && mcPermissions.getInstance().woodCuttingAbility(player)) {  //Why are we checking the permissions here?
                 Skills.abilityCheck(player, SkillType.WOODCUTTING);
             }
-            if (PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) {
+            else if (PP.getPickaxePreparationMode() && Mining.canBeSuperBroken(block)) {
                 Skills.abilityCheck(player, SkillType.MINING);
             }
-            if (PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) {
+            else if (PP.getShovelPreparationMode() && Excavation.canBeGigaDrillBroken(block)) {
                 Skills.abilityCheck(player, SkillType.EXCAVATION);
             }
-            if (PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || mat.equals(Material.SNOW))) {
+            else if (PP.getFistsPreparationMode() && (Excavation.canBeGigaDrillBroken(block) || mat.equals(Material.SNOW))) {
                 Skills.abilityCheck(player, SkillType.UNARMED);
             }
         }
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
index 3bd424cc7..55e1dc535 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -12,12 +12,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityTameEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
diff --git a/src/main/java/com/gmail/nossr50/skills/Skills.java b/src/main/java/com/gmail/nossr50/skills/Skills.java
index 58323a53d..cce71efbe 100644
--- a/src/main/java/com/gmail/nossr50/skills/Skills.java
+++ b/src/main/java/com/gmail/nossr50/skills/Skills.java
@@ -328,15 +328,14 @@ public class Skills
     	case GIGA_DRILL_BREAKER:
     	case SUPER_BREAKER:
     	case LEAF_BLOWER:
-    		if (!m.blockBreakSimulate(block, player, true)) {
-    			activate = false;
-    			break;
-    		}
     		if (!ability.blockCheck(block)) {
     			activate = false;
     			break;
     		}
+    		break;
+    		
     	default:
+    		activate = false;
     		break;
     	}
     	return activate;