summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-17 06:36:08 +1000
committermd_5 <git@md-5.net>2018-07-17 06:36:08 +1000
commitfa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb (patch)
tree003411471429e5dc99f31d3809a64d68eb48250c /src/main/java
parentf03c10c185cb9a6737d565d81ae6b61b6babb657 (diff)
downloadcraftbukkit-fa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb.tar
craftbukkit-fa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb.tar.gz
craftbukkit-fa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb.tar.lz
craftbukkit-fa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb.tar.xz
craftbukkit-fa1340f7a66a49bfbd02fdcdd1c8c0eed9941efb.zip
SPIGOT-4022: Improve utility of Entity.getName for non-players
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 57656777..64cfc951 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/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/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 269bbd8e..073c8acf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/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;
}