diff --git a/build.gradle b/build.gradle index b6d07527ab..0e557493be 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript{ } dependencies{ - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8-SNAPSHOT' classpath "com.badlogicgames.gdx:gdx-tools:1.9.10" classpath "com.github.anuken:packr:-SNAPSHOT" } @@ -21,12 +21,12 @@ allprojects{ group = 'com.github.Anuken' ext{ - versionNumber = '4' + versionNumber = '5' if(!project.hasProperty("versionModifier")) versionModifier = 'release' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' gdxVersion = '1.9.10' - roboVMVersion = '2.3.7' + roboVMVersion = '2.3.8-SNAPSHOT' steamworksVersion = '1.8.0' arcHash = null @@ -169,7 +169,7 @@ project(":ios"){ props.load(new FileInputStream(vfile)) }else{ props['app.id'] = 'io.anuke.mindustry' - props['app.version'] = '4.2.1' + props['app.version'] = '5.0' props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher' props['app.executable'] = 'IOSLauncher' props['app.name'] = 'Mindustry' diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 27b52d6ad0..bcf4ddfb82 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -142,7 +142,7 @@ public class DesktopLauncher extends ClientLauncher{ try{ SteamAPI.loadLibraries(); }catch(Throwable t){ - Log.err(t); + logSteamError(t); fallbackSteam(); } @@ -155,11 +155,21 @@ public class DesktopLauncher extends ClientLauncher{ }catch(Throwable e){ steam = false; Log.err("Failed to load Steam native libraries."); - Log.err(e); + logSteamError(e); } } } + void logSteamError(Throwable e){ + Log.err(e); + try(OutputStream s = new FileOutputStream(new File("steam-error-log-" + System.nanoTime() + ".txt"))){ + String log = Strings.parseException(e, true); + s.write(log.getBytes()); + }catch(Exception e2){ + Log.err(e2); + } + } + void fallbackSteam(){ try{ String name = "steam_api"; @@ -169,7 +179,7 @@ public class DesktopLauncher extends ClientLauncher{ Streams.copyStream(getClass().getResourceAsStream(name), new FileOutputStream(name)); System.loadLibrary(new File(name).getAbsolutePath()); }catch(Throwable e){ - Log.err(e); + logSteamError(e); } } diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 3d5429d885..d8a06ac6e0 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -816,10 +816,6 @@ public class ServerControl implements ApplicationListener{ if(state.rules.pvp){ p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players))); } - if(p.getClosestCore() != null){ - p.setDead(false); - p.setNet(p.getClosestCore().x, p.getClosestCore().y); - } netServer.sendWorldData(p); } inExtraRound = false;