Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-01 18:50:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Hide editor when joining a game

Browse Source
This commit is contained in:
Anuken
2026-06-18 09:59:50 -04:00
parent de2cba940d
commit 368e787f89
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/dialogs/JoinDialog.java
+2
View File
@@ -598,6 +598,8 @@ public class JoinDialog extends BaseDialog{
netClient.disconnectQuietly();
});
ui.editor.hide();
Time.runTask(2f, () -> {
logic.reset();
net.reset();
desktop/src/mindustry/desktop/steam/SNet.java
+19 -14
View File
@@ -285,26 +285,31 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
return;
}
logic.reset();
net.reset();
ui.editor.hide();
currentLobby = steamIDLobby;
currentServer = smat.getLobbyOwner(steamIDLobby);
//delay joining by one frame because the editor bugs out if you don't
Core.app.post(() -> {
logic.reset();
net.reset();
Log.info("Connect to owner @: @", currentServer.getAccountID(), friends.getFriendPersonaName(currentServer));
currentLobby = steamIDLobby;
currentServer = smat.getLobbyOwner(steamIDLobby);
if(joinCallback != null){
joinCallback.run();
joinCallback = null;
}
Log.info("Connecting to owner @: @", currentServer.getAccountID(), friends.getFriendPersonaName(currentServer));
Connect con = new Connect();
con.addressTCP = "steam:" + currentServer.getAccountID();
if(joinCallback != null){
joinCallback.run();
joinCallback = null;
}
net.setClientConnected();
net.handleClientReceived(con);
Connect con = new Connect();
con.addressTCP = "steam:" + currentServer.getAccountID();
Core.app.post(() -> Core.app.post(() -> Core.app.post(() -> Log.info("Server: @\nClient: @\nActive: @", net.server(), net.client(), net.active()))));
net.setClientConnected();
net.handleClientReceived(con);
Core.app.post(() -> Core.app.post(() -> Core.app.post(() -> Log.info("Server: @\nClient: @\nActive: @", net.server(), net.client(), net.active()))));
});
}
@Override