From a621457aeb090e6a603d106b33e412ebb913e74c Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sun, 30 Nov 2014 10:30:32 +0000
Subject: [PATCH] Correct the return value of getPlayerListName

By: Thinkofdeath <thinkofdeath@spigotmc.org>
---
 .../main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 286a58c2f4..0f0e160b5c 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/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