From cc48563c0362e1af9b699f8ed2ddd6b82761cf4d Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 4 Apr 2019 16:29:49 -0400 Subject: [PATCH] Ensure owner of Wolf is not null, fixes #760 --- .../main/java/me/blackvein/quests/listeners/PlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java index 983e374e4..b2ced1a98 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java @@ -542,7 +542,7 @@ public class PlayerListener implements Listener { } } else if (damager instanceof Wolf) { Wolf wolf = (Wolf) damager; - if (wolf.isTamed()) { + if (wolf.isTamed() && wolf.getOwner() != null) { Quester quester = plugin.getQuester(wolf.getOwner().getUniqueId()); killPlayer(quester.getPlayer(), evt.getEntity()); }