Fix data accessing code for Keys.LORE

SpongePowered · Aug 28, 2021 · 2e90bc9 · 2e90bc9
1 parent 60c3021
commit 2e90bc9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/spongepowered/common/data/provider/item/stack/ItemStackData.java b/src/main/java/org/spongepowered/common/data/provider/item/stack/ItemStackData.java
@@ -35,6 +35,7 @@
 import org.spongepowered.api.util.weighted.ChanceTable;
 import org.spongepowered.api.util.weighted.NestedTableEntry;
 import org.spongepowered.api.util.weighted.WeightedTable;
+import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.accessor.world.item.DiggerItemAccessor;
 import org.spongepowered.common.adventure.SpongeAdventure;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
@@ -155,11 +156,11 @@ public static void register(final DataProviderRegistrator registrator) {
                     .create(Keys.LORE)
                         .get(h -> {
                             final CompoundTag tag = h.getTag();
-                            if (tag == null || tag.contains(Constants.Item.ITEM_DISPLAY)) {
+                            if (tag == null || !tag.contains(Constants.Item.ITEM_DISPLAY)) {
                                 return null;
                             }
-
-                            final ListTag list = tag.getList(Constants.Item.ITEM_LORE, Constants.NBT.TAG_STRING);
+                            final CompoundTag displayCompound = tag.getCompound(Constants.Item.ITEM_DISPLAY);
+                            final ListTag list = displayCompound.getList(Constants.Item.ITEM_LORE, Constants.NBT.TAG_STRING);
                             return list.isEmpty() ? null : SpongeAdventure.json(list.stream().collect(NBTCollectors.toStringList()));
                         })
                         .set((h, v) -> {