Merge remote-tracking branch 'origin/master'

2020-01-02 14:10:22 -05:00
parent cb76e80836 d161ba442f
commit e214a8e7c0
2 changed files with 3 additions and 2 deletions
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -21,7 +21,8 @@ public class Scripts implements Disposable{
        context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") ||
            type.startsWith("adapter") || type.contains("PrintStream") ||
            type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess"));
-
+        context.getWrapFactory().setJavaPrimitiveWrap(false);
+        
        scope = new ImporterTopLevel(context);
        wrapper = Core.files.internal("scripts/wrapper.js").readString();