From f72f2bdf5d407d99e5aaafb04ebad2b15ed1e68b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 15 Sep 2019 13:52:56 -0400 Subject: [PATCH] Fixed servers not discovering --- desktop/build.gradle | 2 +- desktop/src/io/anuke/mindustry/desktop/steam/SNet.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index b31d856679..fa29af4f96 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -52,7 +52,7 @@ task steamtest(dependsOn: dist){ copy{ from "build/libs/Mindustry.jar" if(System.properties["os.name"].contains("Mac")){ - into "/Users/anuke/Library/Application Support/Steam/steamapps/common/Mindustry/Contents/Resources" + into "/Users/anuke/Library/Application Support/Steam/steamapps/common/Mindustry/Mindustry.app/Contents/Resources" }else{ into "/home/anuke/.steam/steam/steamapps/common/Mindustry/jre" } diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java index ef6824b734..6bf1c50448 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java +++ b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java @@ -267,7 +267,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, @Override public void onLobbyMatchList(int matches){ - Log.info("found {0} matches", matches); + Log.info("found {0} matches {1}", matches, lobbyDoneCallback); if(lobbyDoneCallback != null){ for(int i = 0; i < matches; i++){ @@ -281,13 +281,13 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, smat.getNumLobbyMembers(lobby), Strings.parseInt(smat.getLobbyData(lobby, "name"), -1), smat.getLobbyData(lobby, "versionType"), - Gamemode.all[Strings.parseInt(smat.getLobbyData(lobby, "gamemode"))], + Gamemode.valueOf(smat.getLobbyData(lobby, "gamemode")), smat.getLobbyMemberLimit(lobby) ); lobbyCallback.accept(out); }catch(Exception e){ - e.printStackTrace(); + Log.err(e); } } @@ -316,7 +316,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, smat.setLobbyData(steamID, "version", Version.build + ""); smat.setLobbyData(steamID, "versionType", Version.type); smat.setLobbyData(steamID, "wave", state.wave + ""); - smat.setLobbyData(steamID, "gamemode", Gamemode.bestFit(state.rules) + ""); + smat.setLobbyData(steamID, "gamemode", Gamemode.bestFit(state.rules).name() + ""); } }