Fix some slot setting issues (#1822)

SkriptLang · Jan 19, 2019 · c2f1048 · c2f1048
1 parent 5e3fa5f
commit c2f1048
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/ch/njol/skript/aliases/ItemData.java b/src/main/java/ch/njol/skript/aliases/ItemData.java
@@ -422,7 +422,7 @@ public ItemData aliasCopy() {
 	 * @param meta Item meta.
 	 */
 	public void applyMeta(ItemMeta meta) {
-		ItemMeta our = stack.getItemMeta();
+		ItemMeta our = getItemMeta();
 		if (meta.hasLore())
 			our.setLore(meta.getLore());
 		if (meta.hasDisplayName())

diff --git a/src/main/java/ch/njol/skript/expressions/ExprNamed.java b/src/main/java/ch/njol/skript/expressions/ExprNamed.java
@@ -26,6 +26,7 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -78,6 +79,16 @@ protected Object[] get(final Event e, final Object[] source) {
 			public Object get(Object obj) {
 				if (obj instanceof InventoryType)
 					return Bukkit.createInventory(null, (InventoryType) obj, name);
+				if (obj instanceof ItemStack) {
+					ItemStack stack = (ItemStack) obj;
+					stack = stack.clone();
+					ItemMeta meta = stack.getItemMeta();
+					if (meta != null) {
+						meta.setDisplayName(name);
+						stack.setItemMeta(meta);
+					}
+					return new ItemType(stack);
+				}
 				ItemType item = (ItemType) obj;
 				item = item.clone();
 				ItemMeta meta = item.getItemMeta();

diff --git a/src/main/java/ch/njol/skript/util/slot/InventorySlot.java b/src/main/java/ch/njol/skript/util/slot/InventorySlot.java
@@ -42,7 +42,7 @@ public class InventorySlot extends SlotWithIndex {
 
 	public InventorySlot(final Inventory invi, final int index) {
 		assert invi != null;
-		assert index > 0;
+		assert index >= 0;
 		this.invi = invi;
 		this.index = index;
 	}