mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-08 23:07:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #4802

Browse Source
This commit is contained in:
Anuken
2021-02-26 13:13:37 -05:00
parent 1bb97cae39
commit 8349c8a5b8
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/core/NetClient.java
View File

@ -66,6 +66,13 @@ public class NetClient implements ApplicationListener{
reset(); reset();
//connection after reset
if(!net.client()){
Log.info("Connection canceled.");
disconnectQuietly();
return;
}
ui.loadfrag.hide(); ui.loadfrag.hide();
ui.loadfrag.show("@connecting.data"); ui.loadfrag.show("@connecting.data");

2
core/src/mindustry/type/UnitType.java
View File

@ -193,7 +193,7 @@ public class UnitType extends UnlockableContent{
if(unit.controller() instanceof LogicAI){ if(unit.controller() instanceof LogicAI){
table.row(); table.row();
table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().left(); table.add(Blocks.microProcessor.emoji() + " " + Core.bundle.get("units.processorcontrol")).growX().wrap().left();
table.row(); table.row();
table.label(() -> Iconc.settings + " " + (long)unit.flag + "").color(Color.lightGray).growX().wrap().left(); table.label(() -> Iconc.settings + " " + (long)unit.flag + "").color(Color.lightGray).growX().wrap().left();
} }

2
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@ -463,8 +463,10 @@ public class JoinDialog extends BaseDialog{
net.reset(); net.reset();
Vars.netClient.beginConnecting(); Vars.netClient.beginConnecting();
net.connect(lastIp = ip, lastPort = port, () -> { net.connect(lastIp = ip, lastPort = port, () -> {
if(net.client()){
hide(); hide();
add.hide(); add.hide();
}
}); });
}); });
} }