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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-09-06 14:05:13 -04:00
parent 75ba33abc0
commit 24bb2428e7
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/src/io/anuke/mindustry/desktop/steam/SteamCoreNetImpl.java
View File

@@ -9,6 +9,7 @@ import io.anuke.arc.collection.*;
import io.anuke.arc.function.*; import io.anuke.arc.function.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.*; import io.anuke.arc.util.pooling.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.EventType.*;
import io.anuke.mindustry.game.Version; import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
@@ -273,19 +274,25 @@ public class SteamCoreNetImpl implements SteamNetworkingCallback, SteamMatchmaki
if(lobbyDoneCallback != null){ if(lobbyDoneCallback != null){
for(int i = 0; i < matches; i++){ for(int i = 0; i < matches; i++){
SteamID lobby = smat.getLobbyByIndex(i); try{
Host out = new Host( SteamID lobby = smat.getLobbyByIndex(i);
smat.getLobbyData(lobby, "name"), Host out = new Host(
"steam:" + lobby.getAccountID(), smat.getLobbyData(lobby, "name"),
smat.getLobbyData(lobby, "mapname"), "steam:" + lobby.getAccountID(),
Strings.parseInt(smat.getLobbyData(lobby, "wave"), -1), smat.getLobbyData(lobby, "mapname"),
smat.getNumLobbyMembers(lobby), Strings.parseInt(smat.getLobbyData(lobby, "wave"), -1),
Strings.parseInt(smat.getLobbyData(lobby, "name"), -1), smat.getNumLobbyMembers(lobby),
smat.getLobbyData(lobby, "versionType")); Strings.parseInt(smat.getLobbyData(lobby, "name"), -1),
smat.getLobbyData(lobby, "versionType"),
Gamemode.all[Strings.parseInt(smat.getLobbyData(lobby, "gamemode"))],
smat.getLobbyMemberLimit(lobby)
);
lobbyIDs.put(lobby.getAccountID() + "", lobby); lobbyIDs.put(lobby.getAccountID() + "", lobby);
lobbyCallback.accept(out);
lobbyCallback.accept(out); }catch(Exception e){
e.printStackTrace();
}
} }
lobbyDoneCallback.run(); lobbyDoneCallback.run();
@@ -315,6 +322,7 @@ public class SteamCoreNetImpl implements SteamNetworkingCallback, SteamMatchmaki
smat.setLobbyData(steamID, "version", Version.build + ""); smat.setLobbyData(steamID, "version", Version.build + "");
smat.setLobbyData(steamID, "versionType", Version.type); smat.setLobbyData(steamID, "versionType", Version.type);
smat.setLobbyData(steamID, "wave", state.wave + ""); smat.setLobbyData(steamID, "wave", state.wave + "");
smat.setLobbyData(steamID, "gamemode", Gamemode.bestFit(state.rules) + "");
friends.activateGameOverlayInviteDialog(currentLobby); friends.activateGameOverlayInviteDialog(currentLobby);
Log.info("Activating overlay dialog"); Log.info("Activating overlay dialog");