summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-18 17:39:04 +1000
committermd_5 <git@md-5.net>2018-07-18 17:39:04 +1000
commit65bc676ed092501ce985d1c247d15b2853af84e1 (patch)
tree8a3f4e6f3a8f61871242acb73c31026a5d432083
parent6fa4ae693e8084d40686fdb01038da6b2b38db4e (diff)
downloadcraftbukkit-65bc676ed092501ce985d1c247d15b2853af84e1.tar
craftbukkit-65bc676ed092501ce985d1c247d15b2853af84e1.tar.gz
craftbukkit-65bc676ed092501ce985d1c247d15b2853af84e1.tar.lz
craftbukkit-65bc676ed092501ce985d1c247d15b2853af84e1.tar.xz
craftbukkit-65bc676ed092501ce985d1c247d15b2853af84e1.zip
SPIGOT-4041: Fix regressed item naming
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index dfd6e66b..c3e3bba2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -466,10 +466,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@Overridden
void applyToItem(NBTTagCompound itemTag) {
if (hasDisplayName()) {
- setDisplayTag(itemTag, NAME.NBT, new NBTTagString(CraftChatMessage.toJSON(displayName)));
+ setDisplayTag(itemTag, NAME.NBT, new NBTTagString(CraftChatMessage.fromComponent(displayName))); // SPIGOT-4041: Should be JSON, but we're still aggressively converting stacks & old+new are both valid
}
if (hasLocalizedName()){
- setDisplayTag(itemTag, LOCNAME.NBT, new NBTTagString(CraftChatMessage.toJSON(locName)));
+ setDisplayTag(itemTag, LOCNAME.NBT, new NBTTagString(CraftChatMessage.fromComponent(locName))); // SPIGOT-4041: Should be JSON, but we're still aggressively converting stacks & old+new are both valid
}
if (hasLore()) {