mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-14 21:32:39 -08:00
Code Issues Projects Releases Wiki Activity

Fixed misc compile errors

Browse source
This commit is contained in:
Anuken 2019-03-12 13:46:40 -04:00
parent aa69af64fb
commit e8204fc983
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
android/src/io/anuke/mindustry/AndroidLauncher.java
View file

@ -178,12 +178,14 @@ public class AndroidLauncher extends AndroidApplication{
ui.showError("$save.import.invalid");
}
}else if(map){ //open map
FileHandle file = Core.files.local("temp-map." + mapExtension);
file.write(inStream, false);
Core.app.post(() -> {
System.out.println("Opening map.");
if(!ui.editor.isShown()){
ui.editor.show();
}
ui.editor.beginEditMap(inStream);
ui.editor.beginEditMap(file);
});
}
});

1
server/src/io/anuke/mindustry/server/ServerControl.java
View file

@ -46,7 +46,6 @@ public class ServerControl implements ApplicationListener{
private FileHandle currentLogFile;
private boolean inExtraRound;
private Task lastTask;
private RulePreset lastPreset;
public ServerControl(String[] args){
Core.settings.defaults(