Property Implementation Fixes (SkriptLang#8354)

Author: APickledWalrus

src/main/java/org/skriptlang/skript/common/properties/conditions/PropCondContains.java

@@ -150,8 +150,9 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 			var convertedNeedles = needles.getConvertedExpression((Class[]) elementTypeSet);
 			if (convertedNeedles == null) {
 				// attempt direct contains
-				return initDirect("'" + tempHaystack + "'  cannot contain " + Classes.toString(Arrays.stream(needles.possibleReturnTypes()).map(Classes::getSuperClassInfo).toArray(), false));
+				return initDirect("'" + tempHaystack + "' cannot contain " + Classes.toString(Arrays.stream(needles.possibleReturnTypes()).map(Classes::getSuperClassInfo).toArray(), false));
 			}
+			needles = convertedNeedles;
 			return LiteralUtils.canInitSafely(haystack, needles);
 		} else {
 			return initDirect(null);

src/main/java/org/skriptlang/skript/lang/properties/PropertyBaseExpression.java

@@ -14,6 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.common.properties.expressions.PropExprName;
+import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.lang.properties.Property.PropertyInfo;
 import org.skriptlang.skript.lang.properties.handlers.base.ExpressionPropertyHandler;
 
@@ -208,20 +209,38 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 			}
 
 			// check if delta matches any of the allowed types
-			for (Class<?> allowedType : allowedTypes) {
-				// array type, compare to delta
-				// single type, compare to delta[0]
-				if ((allowedType.isArray() && allowedType.isInstance(delta))
-					|| (delta != null && allowedType.isInstance(delta[0]))) {
-					// if the propertyHaver is allowed, change
-					@SuppressWarnings("unchecked")
-					var handler = (ExpressionPropertyHandler<Object, ?>) propertyInfo.handler();
-					handler.change(propertyHaver, delta, mode);
-					return propertyHaver;
+			assert delta != null;
+			Object[] verifiedDelta = delta;
+			Class<?>[] flatAllowedTypes = new Class[allowedTypes.length];
+			for (int i = 0; i < allowedTypes.length; i++) {
+				flatAllowedTypes[i] = Utils.getComponentType(allowedTypes[i]);
+			}
+			boolean tryConverting = false;
+			deltaLoop: for (Object object : verifiedDelta) {
+				for (Class<?> allowedType : flatAllowedTypes) {
+					if (allowedType.isInstance(object)) {
+						continue deltaLoop;
+					}
+				}
+				// delta value cannot be mapped to any allowed types
+				tryConverting = true;
+			}
+			if (tryConverting) {
+				// typing of delta may not be safe, create a new array
+				Object[] newDelta = new Object[verifiedDelta.length];
+				Converters.convert(verifiedDelta, newDelta, flatAllowedTypes);
+				for (Object object : newDelta) {
+					if (object == null) { // conversion failed
+						return null;
+					}
 				}
+				verifiedDelta = newDelta;
 			}
-			// no matching types, go next
-			return null;
+			// all values verified, convert
+			//noinspection unchecked
+			var handler = (ExpressionPropertyHandler<Object, ?>) propertyInfo.handler();
+			handler.change(propertyHaver, verifiedDelta, mode);
+			return propertyHaver;
 		};
 
 		if (useCIP) {

src/test/skript/tests/syntaxes/conditions/PropCondContains.sk

@@ -0,0 +1,2 @@
+test "PropCondContains conversion":
+	assert "%uuid of world "world"%" contains uuid of world "world" with "failed to convert uuid to string for contains"