From c96427c722b5785c460005d8e4ad37c8f7686d14 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 4 Mar 2020 09:01:41 -0500
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/core/Control.java          |  6 +++---
 core/src/mindustry/mod/Mods.java              |  1 +
 .../ui/dialogs/CustomGameDialog.java          |  1 -
 desktop/src/mindustry/desktop/steam/SNet.java | 19 ++++++++-----------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index 7c86601bb3..2a064ada79 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -3,12 +3,12 @@ package mindustry.core;
 import arc.*;
 import arc.assets.*;
 import arc.audio.*;
-import arc.struct.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.input.*;
 import arc.math.geom.*;
 import arc.scene.ui.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.core.GameState.*;
@@ -114,7 +114,7 @@ public class Control implements ApplicationListener, Loadable{
         });
 
         //autohost for pvp maps
-        Events.on(WorldLoadEvent.class, event -> {
+        Events.on(WorldLoadEvent.class, event -> app.post(() -> {
             if(state.rules.pvp && !net.active()){
                 try{
                     net.host(port);
@@ -124,7 +124,7 @@ public class Control implements ApplicationListener, Loadable{
                     Core.app.post(() -> state.set(State.menu));
                 }
             }
-        });
+        }));
 
         Events.on(UnlockEvent.class, e -> ui.hudfrag.showUnlock(e.content));
 
diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java
index 6c3151b6c7..66dc8d6fa7 100644
--- a/core/src/mindustry/mod/Mods.java
+++ b/core/src/mindustry/mod/Mods.java
@@ -21,6 +21,7 @@ import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.graphics.MultiPacker.*;
+import mindustry.plugin.*;
 import mindustry.type.*;
 import mindustry.ui.*;
 
diff --git a/core/src/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
index f47a3ac796..9b3107820a 100644
--- a/core/src/mindustry/ui/dialogs/CustomGameDialog.java
+++ b/core/src/mindustry/ui/dialogs/CustomGameDialog.java
@@ -73,7 +73,6 @@ public class CustomGameDialog extends FloatingDialog{
             image.row();
             image.add(img).size(images);
 
-
             BorderImage border = new BorderImage(map.safeTexture(), 3f);
             border.setScaling(Scaling.fit);
             image.replaceImage(border);
diff --git a/desktop/src/mindustry/desktop/steam/SNet.java b/desktop/src/mindustry/desktop/steam/SNet.java
index 218b02ca42..3e2ec342e7 100644
--- a/desktop/src/mindustry/desktop/steam/SNet.java
+++ b/desktop/src/mindustry/desktop/steam/SNet.java
@@ -1,16 +1,16 @@
 package mindustry.desktop.steam;
 
 import arc.*;
+import arc.func.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.pooling.*;
 import com.codedisaster.steamworks.*;
 import com.codedisaster.steamworks.SteamFriends.*;
 import com.codedisaster.steamworks.SteamMatchmaking.*;
 import com.codedisaster.steamworks.SteamNetworking.*;
-import arc.struct.*;
-import arc.func.*;
-import arc.util.*;
-import arc.util.pooling.*;
 import mindustry.core.GameState.*;
-import mindustry.core.Version;
+import mindustry.core.*;
 import mindustry.game.EventType.*;
 import mindustry.game.*;
 import mindustry.net.ArcNetProvider.*;
@@ -240,12 +240,9 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
             return;
         }
 
-        if(net.active()){
-            net.disconnect();
-            net.closeServer();
-            logic.reset();
-            state.set(State.menu);
-        }
+        logic.reset();
+        net.reset();
+        state.set(State.menu);
 
         currentLobby = steamIDLobby;
         currentServer = smat.getLobbyOwner(steamIDLobby);