Merge branch 'freeze'

.settings/org.eclipse.buildship.core.prefs

@@ -1,10 +1,10 @@
-build.commands=org.eclipse.jdt.core.javabuilder
-connection.arguments=
-connection.java.home=null
-connection.jvm.arguments=
-connection.project.dir=
-containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
-derived.resources=.gradle,build
-eclipse.preferences.version=1
-natures=org.eclipse.jdt.core.javanature
-project.path=\:
+build.commands=org.eclipse.jdt.core.javabuilder
+connection.arguments=
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=
+containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature
+project.path=\:

gradle.properties

@@ -1,3 +1,3 @@
 groupid=ch.njol
 name=skript
-version=2.3.5
+version=2.3.6

src/main/java/ch/njol/skript/lang/Expression.java

@@ -19,6 +19,7 @@
  */
 package ch.njol.skript.lang;
 
+import java.util.Arrays;
 import java.util.Iterator;
 
 import org.bukkit.event.Event;
@@ -27,6 +28,7 @@
 
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.classes.Changer;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.classes.Changer.ChangerUtils;
@@ -289,9 +291,14 @@ default Object[] beforeChange(Expression<?> changed, @Nullable Object[] delta) {
 						// Initialize new delta to avoid storing incompatible type to array
 						newDelta = new Object[delta.length];
 						System.arraycopy(delta, 0, newDelta, 0, i); // Copy previously processed elements
+						newDelta[i] =  ((Slot) value).getItem(); // Convert this slot to item
 					} else {
 						delta[i] =  ((Slot) value).getItem();
 					}
+				} else if (value instanceof ItemType) {
+					delta[i] = ((ItemType) value).clone();
+				} else if (value instanceof ItemStack) {
+					delta[i] = ((ItemStack) value).clone();
 				}
 			}
 		}

src/main/java/ch/njol/skript/util/chat/BungeeConverter.java

@@ -34,7 +34,7 @@
  */
 public class BungeeConverter {
 
-	private static boolean HAS_INSERTION_SUPPORT = Skript.methodExists(BaseComponent.class, "setInsertion");
+	private static boolean HAS_INSERTION_SUPPORT = Skript.methodExists(BaseComponent.class, "setInsertion", String.class);
 
 	@SuppressWarnings("null")
 	public static BaseComponent convert(MessageComponent origin) {