Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 11:06:29 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4100: Ignore invalid item display names

Browse Source
This commit is contained in:
md_5 2018-07-21 09:54:08 +10:00
parent 7c0f69e449
commit 889e17f99d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@ -39,6 +39,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gson.JsonParseException;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -271,11 +272,19 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
NBTTagCompound display = tag.getCompound(DISPLAY.NBT); NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
if (display.hasKey(NAME.NBT)) { if (display.hasKey(NAME.NBT)) {
try {
displayName = IChatBaseComponent.ChatSerializer.a(display.getString(NAME.NBT)); displayName = IChatBaseComponent.ChatSerializer.a(display.getString(NAME.NBT));
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}
} }
if (display.hasKey(LOCNAME.NBT)) { if (display.hasKey(LOCNAME.NBT)) {
try {
locName = IChatBaseComponent.ChatSerializer.a(display.getString(LOCNAME.NBT)); locName = IChatBaseComponent.ChatSerializer.a(display.getString(LOCNAME.NBT));
} catch (JsonParseException ex) {
// Ignore (stripped like Vanilla)
}
} }
if (display.hasKey(LORE.NBT)) { if (display.hasKey(LORE.NBT)) {