Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Anuken
2019-08-22 17:37:16 -04:00
parent d97fe47206
commit 04b4aabcf6
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -334,7 +334,7 @@ public class NetClient implements ApplicationListener{
Net.setClientLoaded(true); Net.setClientLoaded(true);
Core.app.post(Call::connectConfirm); Core.app.post(Call::connectConfirm);
Time.runTask(40f, Platform.instance::updateRPC); 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()); Core.app.post(() -> ui.loadfrag.hide());
} }

5
core/src/io/anuke/mindustry/net/Net.java
View File

@@ -91,6 +91,11 @@ public class Net{
packetQueue.clear(); packetQueue.clear();
} }
public static void setClientConnected(){
active = true;
server = false;
}
/** /**
* Connect to an address. * Connect to an address.
*/ */

5
desktop/src/io/anuke/mindustry/desktop/steam/SteamNetImpl.java
View File

@@ -63,7 +63,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
}else{ }else{
Log.err("Unknown user with ID: {0}", fromID); 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)); Core.app.post(() -> Net.handleClientReceived(output));
} }
}); });
@@ -205,6 +205,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
Connect con = new Connect(); Connect con = new Connect();
con.addressTCP = "steam:" + currentServer.getAccountID(); con.addressTCP = "steam:" + currentServer.getAccountID();
Net.setClientConnected();
Net.handleClientReceived(con); Net.handleClientReceived(con);
Log.info("enter lobby {0} {1}", steamIDLobby.getAccountID(), response); Log.info("enter lobby {0} {1}", steamIDLobby.getAccountID(), response);
} }
@@ -283,7 +284,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
@Override @Override
public void onP2PSessionRequest(SteamID steamIDRemote){ public void onP2PSessionRequest(SteamID steamIDRemote){
Log.info("Connection request: {0}", steamIDRemote.getAccountID()); Log.info("Connection request: {0}", steamIDRemote.getAccountID());
if(Net.client()){ if(currentServer != null && !Net.server()){
Log.info("Am client"); Log.info("Am client");
if(steamIDRemote == currentServer){ if(steamIDRemote == currentServer){
snet.acceptP2PSessionWithUser(steamIDRemote); snet.acceptP2PSessionWithUser(steamIDRemote);