From c8e41c08ea65eae0099c01c1a40d9ad89a8806eb Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 1 Jan 2018 18:01:24 -0500 Subject: [PATCH] Fixed Kryo crash --- .../io/anuke/mindustry/AndroidLauncher.java | 3 --- .../io/anuke/mindustry/core/NetServer.java | 2 ++ .../mindustry/desktop/DesktopLauncher.java | 3 --- kryonet/build/libs/kryonet-release.jar | Bin 7637 -> 7759 bytes kryonet/src/io/anuke/kryonet/KryoClient.java | 16 ++++++++++++-- kryonet/src/io/anuke/kryonet/KryoServer.java | 20 +++++++++++++++--- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 660caabb4e..ebd5f40d5f 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -7,7 +7,6 @@ import android.os.Bundle; import android.telephony.TelephonyManager; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import com.esotericsoftware.minlog.Log; import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoServer; import io.anuke.mindustry.io.PlatformFunction; @@ -65,8 +64,6 @@ public class AndroidLauncher extends AndroidApplication{ config.hideStatusBar = true; - Log.set(Log.LEVEL_DEBUG); - Net.setClientProvider(new KryoClient()); Net.setServerProvider(new KryoServer()); diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index a74777fff3..f8f8829272 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -95,6 +95,8 @@ public class NetServer extends Module{ Gdx.app.postRunnable(() -> Vars.ui.showInfo(Bundles.format("text.server.disconnected", player.name))); + player.remove(); + DisconnectPacket dc = new DisconnectPacket(); dc.playerid = player.id; diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 36e76539c3..40efec90c8 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.desktop; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; import com.badlogic.gdx.utils.Array; -import com.esotericsoftware.minlog.Log; import io.anuke.kryonet.KryoClient; import io.anuke.kryonet.KryoServer; import io.anuke.mindustry.Mindustry; @@ -59,8 +58,6 @@ public class DesktopLauncher { Mindustry.args = Array.with(arg); - Log.set(Log.LEVEL_DEBUG); - Net.setClientProvider(new KryoClient()); Net.setServerProvider(new KryoServer()); diff --git a/kryonet/build/libs/kryonet-release.jar b/kryonet/build/libs/kryonet-release.jar index e2350720b9fe8d4f4152ac07bde317b9aecddff7..e60785629e468baa11f0c74559b1fbba6c3355fa 100644 GIT binary patch delta 6904 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 diff --git a/kryonet/src/io/anuke/kryonet/KryoClient.java b/kryonet/src/io/anuke/kryonet/KryoClient.java index 13182c7d94..1aaaf9f20e 100644 --- a/kryonet/src/io/anuke/kryonet/KryoClient.java +++ b/kryonet/src/io/anuke/kryonet/KryoClient.java @@ -26,13 +26,25 @@ public class KryoClient implements ClientProvider{ Connect c = new Connect(); c.id = connection.getID(); c.addressTCP = connection.getRemoteAddressTCP().toString(); - Net.handleClientReceived(c); + + try{ + Net.handleClientReceived(c); + }catch (Exception e){ + Gdx.app.exit(); + throw new RuntimeException(e); + } } @Override public void disconnected (Connection connection) { Disconnect c = new Disconnect(); - Net.handleClientReceived(c); + + try{ + Net.handleClientReceived(c); + }catch (Exception e){ + Gdx.app.exit(); + throw new RuntimeException(e); + } } @Override diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java index 7b697997ac..4cc9fb95f7 100644 --- a/kryonet/src/io/anuke/kryonet/KryoServer.java +++ b/kryonet/src/io/anuke/kryonet/KryoServer.java @@ -31,20 +31,34 @@ public class KryoServer implements ServerProvider { thread.setDaemon(true); thread.start(); server.addListener(new Listener(){ + @Override public void connected (Connection connection) { Connect c = new Connect(); c.id = connection.getID(); c.addressTCP = connection.getRemoteAddressTCP().toString(); - Net.handleServerReceived(c, c.id); - connections.add(c.id); + + try { + Net.handleServerReceived(c, c.id); + connections.add(c.id); + }catch (Exception e){ + Gdx.app.exit(); + throw new RuntimeException(e); + } } @Override public void disconnected (Connection connection) { Disconnect c = new Disconnect(); c.id = connection.getID(); - Net.handleServerReceived(c, c.id); + + try{ + Net.handleServerReceived(c, c.id); + }catch (Exception e){ + Gdx.app.exit(); + throw new RuntimeException(e); + } + connections.removeValue(c.id); }