diff options
| author | md_5 <git@md-5.net> | 2016-07-22 12:02:16 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-07-22 12:02:16 +1000 |
| commit | 7ae605218b9f458ab514ce19ad892b6453119188 (patch) | |
| tree | a2fb3bed27cbd9799a2bb81677d67e661f071b3d | |
| parent | 7f9fbe54baf0e73dc6a9a1ff58d67f82881507a4 (diff) | |
| download | craftbukkit-7ae605218b9f458ab514ce19ad892b6453119188.tar craftbukkit-7ae605218b9f458ab514ce19ad892b6453119188.tar.gz craftbukkit-7ae605218b9f458ab514ce19ad892b6453119188.tar.lz craftbukkit-7ae605218b9f458ab514ce19ad892b6453119188.tar.xz craftbukkit-7ae605218b9f458ab514ce19ad892b6453119188.zip | |
Fall back to name if skull has no uuid when getting player.
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java index 632d6317..89e4e725 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -181,7 +181,17 @@ public class CraftSkull extends CraftBlockState implements Skull { @Override public OfflinePlayer getOwningPlayer() { - return hasOwner() ? Bukkit.getOfflinePlayer(profile.getId()) : null; + if (profile != null) { + if (profile.getId() != null) { + return Bukkit.getOfflinePlayer(profile.getId()); + } + + if (profile.getName() != null) { + return Bukkit.getOfflinePlayer(profile.getName()); + } + } + + return null; } @Override |