Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed various UI bugs

Browse Source
This commit is contained in:
Anuken
2018-02-02 15:00:00 -05:00
parent 9cd0545fc4
commit ec67418f8a
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kryonet/src/io/anuke/kryonet/KryoServer.java
View File

@@ -36,6 +36,8 @@ import java.nio.ByteBuffer;
import java.nio.channels.ClosedSelectorException;
import java.util.concurrent.CopyOnWriteArrayList;
import static io.anuke.mindustry.Vars.headless;
public class KryoServer implements ServerProvider {
final boolean debug = false;
final Server server;
@@ -420,7 +422,7 @@ public class KryoServer implements ServerProvider {
if (k == null) return;
if(message.equals("_ping_")){
conn.send("---" + Vars.playerGroup.size() + "|" + (Vars.headless ? "Server" : Vars.player.name));
conn.send("---" + Vars.playerGroup.size() + "|" + (headless ? "Server" : Vars.player.name));
connections.remove(k);
}else {
byte[] out = Base64Coder.decode(message);
@@ -436,10 +438,14 @@ public class KryoServer implements ServerProvider {
@Override
public void onError(WebSocket conn, Exception ex) {
Log.info("WS error: ");
ex.printStackTrace();
Log.err(ex);
if(ex instanceof BindException){
Net.closeServer();
Net.showError("$text.server.addressinuse");
if(!headless) {
Net.showError("$text.server.addressinuse");
}else{
Log.err("Web address in use!");
}
}else if(ex.getMessage().equals("Permission denied")){
Net.closeServer();
Net.showError("Permission denied.");