Fix issue with proxies returning ObjectWrapper instead of the actual object it contains

TPGamesNL · TPGamesNL · commit ac1e879798de · 2020-07-04T17:43:39.000+02:00
diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java
@@ -12,6 +12,7 @@
 import com.btk5h.skriptmirror.FunctionWrapper;
 import com.btk5h.skriptmirror.JavaType;
 import com.btk5h.skriptmirror.LibraryLoader;
+import com.btk5h.skriptmirror.ObjectWrapper;
 import com.btk5h.skriptmirror.skript.Consent;
 import com.btk5h.skriptmirror.util.SkriptReflection;
 import com.btk5h.skriptmirror.util.SkriptUtil;
@@ -97,7 +98,7 @@ public Object invoke(Object proxy, Method method, Object[] methodArgs) throws Th
           .toArray(Object[][]::new)
       );
 
-      return returnValue == null ? null : returnValue[0];
+      return returnValue == null ? null : ObjectWrapper.unwrapIfNecessary(returnValue[0]);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import com.btk5h.skriptmirror.FunctionWrapper;`
`13`	`13`	`import com.btk5h.skriptmirror.JavaType;`
`14`	`14`	`import com.btk5h.skriptmirror.LibraryLoader;`
	`15`	`+import com.btk5h.skriptmirror.ObjectWrapper;`
`15`	`16`	`import com.btk5h.skriptmirror.skript.Consent;`
`16`	`17`	`import com.btk5h.skriptmirror.util.SkriptReflection;`
`17`	`18`	`import com.btk5h.skriptmirror.util.SkriptUtil;`
`@@ -97,7 +98,7 @@ public Object invoke(Object proxy, Method method, Object[] methodArgs) throws Th`
`97`	`98`	`.toArray(Object[][]::new)`
`98`	`99`	`);`
`99`	`100`
`100`		`- return returnValue == null ? null : returnValue[0];`
	`101`	`+ return returnValue == null ? null : ObjectWrapper.unwrapIfNecessary(returnValue[0]);`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`