From 04b4aabcf6464cda4a51eaa2a6189c097a5633a2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 22 Aug 2019 17:37:16 -0400
Subject: [PATCH] .

---
 core/src/io/anuke/mindustry/core/NetClient.java              | 2 +-
 core/src/io/anuke/mindustry/net/Net.java                     | 5 +++++
 .../src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java   | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java
index b6e2eec8f4..4766340831 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -334,7 +334,7 @@ public class NetClient implements ApplicationListener{
         Net.setClientLoaded(true);
         Core.app.post(Call::connectConfirm);
         Time.runTask(40f, Platform.instance::updateRPC);
-        Log.info("> connect confirmation");
+        Log.info("> connect confirmation. net status: client={0} server={1}", Net.client(), Net.server());
         Core.app.post(() -> ui.loadfrag.hide());
     }
 
diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java
index 160fd3343d..bad3e6c04f 100644
--- a/core/src/io/anuke/mindustry/net/Net.java
+++ b/core/src/io/anuke/mindustry/net/Net.java
@@ -91,6 +91,11 @@ public class Net{
         packetQueue.clear();
     }
 
+    public static void setClientConnected(){
+        active = true;
+        server = false;
+    }
+
     /**
      * Connect to an address.
      */
diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java b/desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
index 738095c86b..5a4cee3eb1 100644
--- a/desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
+++ b/desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
@@ -63,7 +63,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
                                 }else{
                                     Log.err("Unknown user with ID: {0}", fromID);
                                 }
-                            }else if(Net.client() && currentServer != null && fromID == currentServer.getAccountID()){
+                            }else if(currentServer != null && fromID == currentServer.getAccountID()){
                                 Core.app.post(() -> Net.handleClientReceived(output));
                             }
                         });
@@ -205,6 +205,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
         Connect con = new Connect();
         con.addressTCP = "steam:" + currentServer.getAccountID();
 
+        Net.setClientConnected();
         Net.handleClientReceived(con);
         Log.info("enter lobby {0} {1}", steamIDLobby.getAccountID(), response);
     }
@@ -283,7 +284,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
     @Override
     public void onP2PSessionRequest(SteamID steamIDRemote){
         Log.info("Connection request: {0}", steamIDRemote.getAccountID());
-        if(Net.client()){
+        if(currentServer != null && !Net.server()){
             Log.info("Am client");
             if(steamIDRemote == currentServer){
                 snet.acceptP2PSessionWithUser(steamIDRemote);