From fe4699430df664b13d5f8139afa6da3f06e39389 Mon Sep 17 00:00:00 2001
From: t00thpick1 <t00thpick1dirko@gmail.com>
Date: Tue, 5 Aug 2014 19:15:22 -0400
Subject: [PATCH] Fix #2177

---
 src/main/java/com/gmail/nossr50/listeners/EntityListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 6d8580c9a..81a12f807 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -615,7 +615,7 @@ public class EntityListener implements Listener {
         Player player = (Player) target;
         Tameable tameable = (Tameable) entity;
 
-        if (!CombatUtils.isFriendlyPet(player, tameable)) {
+        if (!UserManager.hasPlayerDataKey(player) || !CombatUtils.isFriendlyPet(player, tameable)) {
             return;
         }