From 251b8deb254d4df755f453349caf483207e02444 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 1 Oct 2019 17:35:23 -0400 Subject: [PATCH] Fixed steam crash with a workaround --- core/src/io/anuke/mindustry/core/Control.java | 5 ++++- .../src/io/anuke/mindustry/desktop/DesktopLauncher.java | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 75519d1d08..104f5c6706 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -388,7 +388,10 @@ public class Control implements ApplicationListener, Loadable{ saves.update(); //update and load any requested assets - assets.update(); + try{ + assets.update(); + }catch(Exception ignored){ + } input.updateState(); diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 2a5dcd433c..af4a54a6ae 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -26,7 +26,9 @@ import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Net.*; import io.anuke.mindustry.ui.*; +import java.io.*; import java.net.*; +import java.nio.charset.*; import java.util.*; import static io.anuke.mindustry.Vars.*; @@ -37,6 +39,12 @@ public class DesktopLauncher extends ClientLauncher{ boolean useDiscord = OS.is64Bit, showConsole = OS.getPropertyNotNull("user.name").equals("anuke"); + static{ + if(!Charset.forName("US-ASCII").newEncoder().canEncode(System.getProperty("user.name", ""))){ + System.setProperty("com.codedisaster.steamworks.SharedLibraryExtractPath", new File("").getAbsolutePath()); + } + } + public static void main(String[] arg){ try{ new SdlApplication(new DesktopLauncher(arg), new SdlConfig(){{