From 4d99fe7230fe7e33b0c0de83a5c77f1194bbd24d Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Sun, 4 Mar 2012 23:11:31 -0500
Subject: [PATCH] Fixed ClassCastException with Taming

---
 Changelog.txt                                          |  1 +
 src/main/java/com/gmail/nossr50/Combat.java            | 10 ----------
 .../com/gmail/nossr50/listeners/mcBlockListener.java   |  9 ++++-----
 .../com/gmail/nossr50/listeners/mcEntityListener.java  |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index aa17a08db..608c4193a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -10,6 +10,7 @@ Key:
 Version 2.0.00-dev
  + Added Ocelots to Taming XP tables
  + Added ability to summon Ocelots with Call of the Wild
+ = Fixed ClassCastException from Taming preventDamage checks
 
 Version 1.3.02
  + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them
diff --git a/src/main/java/com/gmail/nossr50/Combat.java b/src/main/java/com/gmail/nossr50/Combat.java
index f1bc42dc1..a415f0dc9 100644
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -167,16 +167,6 @@ public class Combat
 			Swords.counterAttackChecks(event);
 			Acrobatics.dodgeChecks(event);
 		}
-	
-		/*			 
-		 * DEFENSIVE CHECKS FOR WOLVES
-		 */
-		//else if(target instanceof Wolf)
-		//{
-		//	Wolf wolf = (Wolf) target;
-		//	if(wolf.isTamed() && (wolf.getOwner() instanceof Player))
-		//		Taming.preventDamage(event, pluginx);
-		//}
 	}
 	
 	public static void combatAbilityChecks(Player attacker, PlayerProfile PPa)
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
index 8accaa84f..8890bb5af 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
@@ -309,11 +309,10 @@ public class mcBlockListener implements Listener
     				WoodCutting.leafBlower(player, block);
     			}
     		}
-    		else{
-    			if(inhand.getTypeId() != 359){
-	    			event.setInstaBreak(true);
-	    			WoodCutting.leafBlower(player, block);
-    			}
+    		else if(inhand.getTypeId() != 359)
+    		{
+    			event.setInstaBreak(true);
+    			WoodCutting.leafBlower(player, block);
     		}
     		
     	}
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
index a5204d90f..f157aa8c1 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -124,7 +124,7 @@ public class mcEntityListener implements Listener
     		break;
     	case WOLF:
     		Wolf wolf = (Wolf) entity;
-    		if((!m.isInvincible(wolf, event)) && wolf.isTamed() && wolf.getOwner() != null)
+    		if((!m.isInvincible(wolf, event)) && wolf.isTamed() && (wolf.getOwner() instanceof Player))
     			Taming.preventDamage(event, plugin);
     		break;
     	}