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

Made server closing display a loading message

Browse Source
This commit is contained in:
Anuken 2018-01-09 20:16:17 -05:00
parent 09333b60d4
commit 974f0c8689
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@ -17,6 +17,7 @@ text.name=Name:
text.public=Public
text.players={0} players online
text.players.single={0} player online
text.server.closing=[accent]Closing server...
text.server.kicked.kick=You have been kicked from the server!
text.server.kicked.invalidPassword=Invalid password!
text.server.connected={0} has joined.

11
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -34,6 +34,7 @@ public class NetServer extends Module{
/**Maps connection IDs to players.*/
IntMap<Player> connections = new IntMap<>();
float serverSyncTime = 4, itemSyncTime = 10, blockSyncTime = 120;
boolean closing = false;
public NetServer(){
@ -225,8 +226,14 @@ public class NetServer extends Module{
if(!GameState.is(State.menu) && Net.active()){
sync();
}else{
Net.closeServer();
}else if(!closing){
closing = true;
Vars.ui.loadfrag.show("$text.server.closing");
Timers.runTask(5f, () -> {
Net.closeServer();
Vars.ui.loadfrag.hide();
closing = false;
});
}
}