summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-16 14:39:01 +1000
committermd_5 <git@md-5.net>2018-07-16 14:39:01 +1000
commitb6a757dec87043268807b45769b77fd0cb981962 (patch)
tree499dca0f4bbc05375b8d819130945b43d0ef16d8
parent84676f363c9513da5e4dab2891689ff318f4726c (diff)
downloadcraftbukkit-b6a757dec87043268807b45769b77fd0cb981962.tar
craftbukkit-b6a757dec87043268807b45769b77fd0cb981962.tar.gz
craftbukkit-b6a757dec87043268807b45769b77fd0cb981962.tar.lz
craftbukkit-b6a757dec87043268807b45769b77fd0cb981962.tar.xz
craftbukkit-b6a757dec87043268807b45769b77fd0cb981962.zip
SPIGOT-4016: Fix clearing custom names
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f0a52de5..57656777 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -527,12 +527,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@Override
public void setCustomName(String name) {
- if (name == null) {
- name = "";
- }
-
// sane limit for name length
- if (name.length() > 256) {
+ if (name != null && name.length() > 256) {
name = name.substring(0, 256);
}