fix merge again

Author: Efnilite

src/main/java/ch/njol/skript/ScriptLoader.java

@@ -1227,4 +1227,4 @@ public static File getScriptFromName(String script) {
 		}
 	}
 
-}
+}

src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java

@@ -180,6 +180,7 @@ public static String[] getPatterns(PropertyType propertyType, String property, S
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
 		expr = (Expression<? extends T>) expressions[0];
 		setNegated(matchedPattern == 1);
 		return true;
@@ -194,7 +195,11 @@ public final boolean check(Event event) {
 
 	@Override
 	public final boolean test(T value) {
-		return this.check(value);
+		if (isNegated()) {
+			return !this.check(value);
+		} else {
+			return this.check(value);
+		}
 	}
 
 	protected abstract String getPropertyName();