mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 06:20:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-4049: Books lose NBT data

Browse Source
This commit is contained in:
md_5 2018-07-19 10:12:55 +10:00
parent 92dceb827c
commit 595ec64726
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/ItemStack.patch
View File

@ -27,7 +27,7 @@
+ // Called to run this stack through the data converter to handle older storage methods and serialized items + // Called to run this stack through the data converter to handle older storage methods and serialized items
+ public void convertStack() { + public void convertStack() {
+ if (MinecraftServer.getServer() != null) { + if (false && MinecraftServer.getServer() != null) { // Skip for now, causes more issues than it solves
+ // Don't convert some things - both the old and new data values are valid + // Don't convert some things - both the old and new data values are valid
+ // Conversion would make getting then impossible + // Conversion would make getting then impossible
+ if (this.item == Blocks.PUMPKIN.getItem() || this.item == Blocks.GRASS.getItem() || this.item == Blocks.SNOW.getItem()) { + if (this.item == Blocks.PUMPKIN.getItem() || this.item == Blocks.GRASS.getItem() || this.item == Blocks.SNOW.getItem()) {

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

@ -466,10 +466,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@Overridden @Overridden
void applyToItem(NBTTagCompound itemTag) { void applyToItem(NBTTagCompound itemTag) {
if (hasDisplayName()) { if (hasDisplayName()) {
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 setDisplayTag(itemTag, NAME.NBT, new NBTTagString(CraftChatMessage.toJSON(displayName)));
} }
if (hasLocalizedName()){ if (hasLocalizedName()){
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 setDisplayTag(itemTag, LOCNAME.NBT, new NBTTagString(CraftChatMessage.toJSON(locName)));
} }
if (hasLore()) { if (hasLore()) {