From dbebb4f89bb4c5c6d94db67e213733b223220aac Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Tue, 17 Jul 2018 06:36:08 +1000
Subject: [PATCH] SPIGOT-4022: Improve utility of Entity.getName for
 non-players

By: md_5 <git@md-5.net>
---
 .../main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 2 +-
 .../java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 576567774..64cfc9515 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -568,7 +568,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
 
     @Override
     public String getName() {
-        return getHandle().getName();
+        return CraftChatMessage.fromComponent(getHandle().getDisplayName(), EnumChatFormat.WHITE);
     }
 
     @Override
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 269bbd8e7..073c8acf2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -92,6 +92,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
         return getHandle().sleepTicks;
     }
 
+    @Override
+    public String getName() {
+        return getHandle().getName();
+    }
+
     public boolean isOp() {
         return op;
     }