Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Anuken
2019-12-25 12:35:23 -05:00
parent ec4c2c7adb
commit c0f14185a8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/maps/Maps.java
View File

@@ -329,7 +329,7 @@ public class Maps{
return filters; return filters;
}else{ }else{
try{ try{
return JsonIO.read(Array.class, str.replace("mindustrz", "mindustry")); return JsonIO.read(Array.class, str);
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
return readFilters(""); return readFilters("");

2
core/src/mindustry/mod/Scripts.java
View File

@@ -20,7 +20,7 @@ public class Scripts implements Disposable{
context = Vars.platform.getScriptContext(); context = Vars.platform.getScriptContext();
context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") || context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") ||
type.startsWith("adapter") || type.contains("PrintStream") || type.startsWith("adapter") || type.contains("PrintStream") ||
type.startsWith("io.anuke.mindustry")) && !type.equals("mindustry.mod.ClassAccess")); type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess"));
scope = new ImporterTopLevel(context); scope = new ImporterTopLevel(context);
wrapper = Core.files.internal("scripts/wrapper.js").readString(); wrapper = Core.files.internal("scripts/wrapper.js").readString();

2
tools/src/mindustry/tools/Upscaler.java
View File

@@ -1,7 +1,7 @@
package mindustry.tools; package mindustry.tools;
import arc.*; import arc.*;
import io.anuke.arc.backends.sdl.*; import arc.backend.sdl.*;
import arc.files.*; import arc.files.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;