Skip to content

Commit 94e5d28

Browse files
committed
Fix adding list of items to inventory
1 parent c66ccc3 commit 94e5d28

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

src/main/java/ch/njol/skript/classes/data/DefaultChangers.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void change(final Inventory[] invis, final @Nullable Object[] delta, fina
221221
case ADD:
222222
assert delta != null;
223223

224-
if(delta instanceof ItemStack[]) { // Old behavior - legacy code
224+
if(delta instanceof ItemStack[]) { // Old behavior - legacy code (is it used? no idea)
225225
ItemStack[] items = (ItemStack[]) delta;
226226
if(items.length > 36) {
227227
return;
@@ -236,11 +236,20 @@ public void change(final Inventory[] invis, final @Nullable Object[] delta, fina
236236
((ItemType) d).addTo(invi);
237237
}
238238
}
239-
} else if (delta instanceof ItemType[]) {
239+
} else {
240240
for (final Object d : delta) {
241-
((ItemType) d).addTo(invi);
241+
if (d instanceof ItemStack) {
242+
new ItemType((ItemStack) d).addTo(invi); // Can't imagine why would be ItemStack, but just in case...
243+
} else if (d instanceof ItemType) {
244+
((ItemType) d).addTo(invi);
245+
} else if (d instanceof Block) {
246+
new ItemType((Block) d).addTo(invi);
247+
} else {
248+
Skript.error("Can't " + d.toString() + " to an inventory!");
249+
}
242250
}
243251
}
252+
244253
break;
245254
case REMOVE:
246255
case REMOVE_ALL:

0 commit comments

Comments
 (0)