From dfb611458441b20435b0ad7282de56fdd9083dca Mon Sep 17 00:00:00 2001
From: Wizjany <wizjany@gmail.com>
Date: Thu, 31 Jan 2013 08:23:38 -0500
Subject: [PATCH] Fix a few wolf issues

---
 .../sk89q/worldguard/bukkit/WorldGuardEntityListener.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
index 6b38e2ab..d6050104 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
@@ -337,13 +337,17 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
                                 event.setCancelled(true);
                                 return;
                             }
-                        } else if (attacker instanceof Tameable) {
+                        }
+                        if (attacker instanceof Tameable) {
                             if (((Tameable) attacker).getOwner() == null) {
                                 if (!set.allows(DefaultFlag.MOB_DAMAGE, localPlayer)) {
                                     event.setCancelled(true);
                                     return;
                                 }
                             }
+                            if (!(((Tameable) attacker).getOwner() instanceof Player)) {
+                                return;
+                            }
                             Player beastMaster = (Player) ((Tameable) attacker).getOwner();
                             Vector pt2 = toVector(attacker.getLocation());
                             if (!mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP, plugin.wrapPlayer(beastMaster))) {