From ef58f12066f91519bd1a32ce52a4bf1517eeae4d Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 20 Sep 2011 19:10:06 +0100 Subject: [PATCH] Return OfflinePlayer for offline wolf tamers. Thanks robinjam By: Dinnerbone --- .../main/java/org/bukkit/craftbukkit/entity/CraftWolf.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java index d8622f296..fc00141f6 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java @@ -43,9 +43,12 @@ public class CraftWolf extends CraftAnimals implements Wolf { public AnimalTamer getOwner() { // If the wolf has a previously set owner use that, otherwise try and find the player who owns it - if (owner == null) { - // TODO try and recover owner from persistence store before defaulting to playername + if (owner == null && !("").equals(getOwnerName())) { owner = getServer().getPlayer(getOwnerName()); + + if (owner == null) { + owner = getServer().getOfflinePlayer(getOwnerName()); + } } return owner; }