summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-11-30 10:30:32 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-11-30 10:30:32 +0000
commit20207a012418a83ce2c9c0cba06281fd782b4943 (patch)
tree8eac4eb96d393a4732081c19b9e7ccfd9400fee8 /src/main
parent73f4bc343409fe1880595901e4315355270b087c (diff)
downloadcraftbukkit-20207a012418a83ce2c9c0cba06281fd782b4943.tar
craftbukkit-20207a012418a83ce2c9c0cba06281fd782b4943.tar.gz
craftbukkit-20207a012418a83ce2c9c0cba06281fd782b4943.tar.lz
craftbukkit-20207a012418a83ce2c9c0cba06281fd782b4943.tar.xz
craftbukkit-20207a012418a83ce2c9c0cba06281fd782b4943.zip
Correct the return value of getPlayerListName
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 286a58c2..0f0e160b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -176,7 +176,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getPlayerListName() {
- return CraftChatMessage.fromComponent(getHandle().listName);
+ return getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(getHandle().listName);
}
@Override