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-19 23:46:27 -04:00
parent 5a0669d437
commit 5d729c1e8d
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -704,16 +704,10 @@ public class NetServer implements ApplicationListener{
//iterate through each player //iterate through each player
for(int i = 0; i < playerGroup.size(); i++){ for(int i = 0; i < playerGroup.size(); i++){
Player player = playerGroup.all().get(i); Player player = playerGroup.all().get(i);
if(player.isLocal) continue; if(player.isLocal || player.con == null) continue;
NetConnection connection = player.con; NetConnection connection = player.con;
if(connection == null || !connection.isConnected()){
//player disconnected, call d/c event
onDisconnect(player, "disappeared");
return;
}
if(!player.timer.get(Player.timerSync, serverSyncTime) || !connection.hasConnected) continue; if(!player.timer.get(Player.timerSync, serverSyncTime) || !connection.hasConnected) continue;
writeSnapshot(player); writeSnapshot(player);

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -67,7 +67,7 @@ public class PausedDialog extends FloatingDialog{
ui.host.show(); ui.host.show();
} }
} }
}).disabled(b -> net.active() && !steam).colspan(2).width(dw * 2 + 20f).update(e -> e.setText(net.active() && steam ? "$invitefriends" : "$hostserver")); }).disabled(b -> net.active() && !steam).colspan(2).width(dw * 2 + 20f).update(e -> e.setText(net.active() && steam && net.server() ? "$invitefriends" : "$hostserver"));
} }
cont.row(); cont.row();

2
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View File

@@ -143,7 +143,7 @@ public class DesktopLauncher extends ClientLauncher{
SVars.user = new SUser(); SVars.user = new SUser();
Events.on(ClientLoadEvent.class, event -> { Events.on(ClientLoadEvent.class, event -> {
player.name = SVars.net.friends.getPersonaName(); player.name = "ffmpeg";//SVars.net.friends.getPersonaName();
Core.settings.defaults("name", SVars.net.friends.getPersonaName()); Core.settings.defaults("name", SVars.net.friends.getPersonaName());
Core.settings.put("name", player.name); Core.settings.put("name", player.name);
Core.settings.save(); Core.settings.save();