Skip to content

Commit 6c7bb69

Browse files
Fix possible NPE in ItemBuilder init
1 parent 833f143 commit 6c7bb69

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

invui/src/main/java/xyz/xenondevs/invui/item/ItemBuilder.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ public ItemBuilder(Material material, int amount) {
6969
public ItemBuilder(ItemStack base) {
7070
this.itemStack = base.clone();
7171

72-
if (base.isDataOverridden(DataComponentTypes.LORE)) {
73-
ItemLore lore = base.getData(DataComponentTypes.LORE);
74-
assert lore != null;
75-
this.lore = lore.lines();
72+
ItemLore lore = base.getData(DataComponentTypes.LORE);
73+
if (lore != null) {
74+
this.lore = new ArrayList<>(lore.lines());
7675
}
7776

78-
if (base.isDataOverridden(DataComponentTypes.CUSTOM_MODEL_DATA)) {
79-
var cmd = base.getData(DataComponentTypes.CUSTOM_MODEL_DATA);
80-
assert cmd != null;
77+
CustomModelData cmd = base.getData(DataComponentTypes.CUSTOM_MODEL_DATA);
78+
if (cmd != null) {
8179
customModelDataFloats = new FloatArrayList(cmd.floats());
8280
customModelDataBooleans = new BooleanArrayList(cmd.flags());
8381
customModelDataStrings = cmd.strings();

0 commit comments

Comments
 (0)