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

extreme confusion

Browse Source
This commit is contained in:
Anuken
2019-09-22 00:01:48 -04:00
parent 552dc254da
commit b2bae64215
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src/io/anuke/mindustry/desktop/steam/SNet.java
View File

@@ -250,7 +250,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
currentLobby = steamIDLobby; currentLobby = steamIDLobby;
currentServer = smat.getLobbyOwner(steamIDLobby); currentServer = smat.getLobbyOwner(steamIDLobby);
Log.info("Connect to {0}"); Log.info("Connect to owner {0}: {1}", currentServer.getAccountID(), friends.getFriendPersonaName(currentServer));
if(joinCallback != null){ if(joinCallback != null){
joinCallback.run(); joinCallback.run();
@@ -379,12 +379,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
@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(currentServer != null && !net.server()){ if(net.server()){
Log.info("Am client, accepting request");
if(steamIDRemote.equals(currentServer)){
snet.acceptP2PSessionWithUser(steamIDRemote);
}
}else if(net.server()){
Log.info("Am server, accepting request from " + steamIDRemote.getAccountID()); Log.info("Am server, accepting request from " + steamIDRemote.getAccountID());
snet.acceptP2PSessionWithUser(steamIDRemote); snet.acceptP2PSessionWithUser(steamIDRemote);
} }