mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-05 15:58:14 +07:00
.
This commit is contained in:
@ -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());
|
||||
}
|
||||
|
||||
|
@ -91,6 +91,11 @@ public class Net{
|
||||
packetQueue.clear();
|
||||
}
|
||||
|
||||
public static void setClientConnected(){
|
||||
active = true;
|
||||
server = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to an address.
|
||||
*/
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user