From e8204fc9834ba4af89dd172543e42d7c19e32ae3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 12 Mar 2019 13:46:40 -0400 Subject: [PATCH] Fixed misc compile errors --- android/src/io/anuke/mindustry/AndroidLauncher.java | 4 +++- server/src/io/anuke/mindustry/server/ServerControl.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 323352d9eb..49a55ff716 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -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); }); } }); diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 95720c82ee..0fce04de7a 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -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(