This commit is contained in:
Anuken
2019-10-24 18:52:42 -04:00
parent 5d7f14c21f
commit f971061ef4
3 changed files with 17 additions and 11 deletions

View File

@@ -9,7 +9,7 @@ buildscript{
} }
dependencies{ 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.badlogicgames.gdx:gdx-tools:1.9.10"
classpath "com.github.anuken:packr:-SNAPSHOT" classpath "com.github.anuken:packr:-SNAPSHOT"
} }
@@ -21,12 +21,12 @@ allprojects{
group = 'com.github.Anuken' group = 'com.github.Anuken'
ext{ ext{
versionNumber = '4' versionNumber = '5'
if(!project.hasProperty("versionModifier")) versionModifier = 'release' if(!project.hasProperty("versionModifier")) versionModifier = 'release'
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.10' gdxVersion = '1.9.10'
roboVMVersion = '2.3.7' roboVMVersion = '2.3.8-SNAPSHOT'
steamworksVersion = '1.8.0' steamworksVersion = '1.8.0'
arcHash = null arcHash = null
@@ -169,7 +169,7 @@ project(":ios"){
props.load(new FileInputStream(vfile)) props.load(new FileInputStream(vfile))
}else{ }else{
props['app.id'] = 'io.anuke.mindustry' 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.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
props['app.executable'] = 'IOSLauncher' props['app.executable'] = 'IOSLauncher'
props['app.name'] = 'Mindustry' props['app.name'] = 'Mindustry'

View File

@@ -142,7 +142,7 @@ public class DesktopLauncher extends ClientLauncher{
try{ try{
SteamAPI.loadLibraries(); SteamAPI.loadLibraries();
}catch(Throwable t){ }catch(Throwable t){
Log.err(t); logSteamError(t);
fallbackSteam(); fallbackSteam();
} }
@@ -155,11 +155,21 @@ public class DesktopLauncher extends ClientLauncher{
}catch(Throwable e){ }catch(Throwable e){
steam = false; steam = false;
Log.err("Failed to load Steam native libraries."); 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(){ void fallbackSteam(){
try{ try{
String name = "steam_api"; String name = "steam_api";
@@ -169,7 +179,7 @@ public class DesktopLauncher extends ClientLauncher{
Streams.copyStream(getClass().getResourceAsStream(name), new FileOutputStream(name)); Streams.copyStream(getClass().getResourceAsStream(name), new FileOutputStream(name));
System.loadLibrary(new File(name).getAbsolutePath()); System.loadLibrary(new File(name).getAbsolutePath());
}catch(Throwable e){ }catch(Throwable e){
Log.err(e); logSteamError(e);
} }
} }

View File

@@ -816,10 +816,6 @@ public class ServerControl implements ApplicationListener{
if(state.rules.pvp){ if(state.rules.pvp){
p.setTeam(netServer.assignTeam(p, new ArrayIterable<>(players))); 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); netServer.sendWorldData(p);
} }
inExtraRound = false; inExtraRound = false;