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

Implemented HTTPS checking for web multiplayer, fixed chat jamming all text fields

Browse Source
This commit is contained in:
Anuken
2018-01-21 11:54:54 -05:00
parent 40f7bf51c2
commit 2172daf145
7 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,6 +259,7 @@ public class KryoServer implements ServerProvider {
public void dispose(){
try {
server.dispose();
UCore.log("Disposing web server...");
if(webServer != null) webServer.stop(1);
//kill them all
for(Thread thread : Thread.getAllStackTraces().keySet()){
@@ -266,6 +267,7 @@ public class KryoServer implements ServerProvider {
thread.interrupt();
}
}
UCore.log("Killed web server.");
}catch (Exception e){
throw new RuntimeException(e);
}
@@ -403,7 +405,7 @@ public class KryoServer implements ServerProvider {
if (k == null) return;
if(message.equals("_ping_")){
conn.send(connections.size() + "|" + Vars.player.name);
conn.send("---" + connections.size() + "|" + Vars.player.name);
connections.remove(k);
}else {
if (debug) UCore.log("Got message: " + message);