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

fixes

Browse Source
This commit is contained in:
Anuken
2019-08-22 16:51:26 -04:00
parent 64badb2cb7
commit 70b071fa26
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import java.io.*;
import java.nio.*; import java.nio.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import static io.anuke.mindustry.Vars.ui; import static io.anuke.mindustry.Vars.*;
public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCallback, SteamFriendsCallback, ClientProvider, ServerProvider{ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCallback, SteamFriendsCallback, ClientProvider, ServerProvider{
final SteamNetworking snet = new SteamNetworking(this); final SteamNetworking snet = new SteamNetworking(this);
@@ -51,6 +51,7 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
snet.readP2PPacket(from, readBuffer, 0); snet.readP2PPacket(from, readBuffer, 0);
int fromID = from.getAccountID(); int fromID = from.getAccountID();
Object output = serializer.read(readBuffer); Object output = serializer.read(readBuffer);
Log.info("Read {0} of length {1} from {2}", output, length, fromID);
Core.app.post(() -> { Core.app.post(() -> {
if(Net.server()){ if(Net.server()){
@@ -277,23 +278,27 @@ public class SteamNetImpl implements SteamNetworkingCallback, SteamMatchmakingCa
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(Net.client()){
Log.info("Am client");
if(steamIDRemote == currentServer){ if(steamIDRemote == currentServer){
snet.acceptP2PSessionWithUser(steamIDRemote); snet.acceptP2PSessionWithUser(steamIDRemote);
} }
}else if(Net.server()){ }else if(Net.server()){
Log.info("Am server, accepting request.");
//accept users on request //accept users on request
snet.acceptP2PSessionWithUser(steamIDRemote);
if(!steamConnections.containsKey(steamIDRemote.getAccountID())){ if(!steamConnections.containsKey(steamIDRemote.getAccountID())){
SteamConnection con = new SteamConnection(steamIDRemote); SteamConnection con = new SteamConnection(steamIDRemote);
Connect c = new Connect(); Connect c = new Connect();
c.id = con.id; c.id = con.id;
c.addressTCP = "steam:" + steamIDRemote.getAccountID(); c.addressTCP = "steam:" + steamIDRemote.getAccountID();
Log.debug("&bRecieved connection: {0}", c.addressTCP); Log.info("&bRecieved connection: {0}", c.addressTCP);
steamConnections.put(steamIDRemote.getAccountID(), con);
connections.add(con); connections.add(con);
Core.app.post(() -> Net.handleServerReceived(c.id, c)); Net.handleServerReceived(c.id, c);
} }
snet.acceptP2PSessionWithUser(steamIDRemote);
} }
} }