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-25 16:44:55 -04:00
parent 47e723c557
commit fd69241de9
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,13 +405,18 @@ public class NetServer implements ApplicationListener{
return;
}
if(player.con.hasConnected){
Events.fire(new PlayerLeave(player));
Call.sendMessage("[accent]" + player.name + "[accent] has disconnected.");
Call.onPlayerDisconnect(player.id);
if(!player.con.hasDisconnected){
if(player.con.hasConnected){
Events.fire(new PlayerLeave(player));
Call.sendMessage("[accent]" + player.name + "[accent] has disconnected.");
Call.onPlayerDisconnect(player.id);
}
Log.info("&lm[{1}] &lc{0} has disconnected. &lg&fi({2})", player.name, player.uuid, reason);
}
player.remove();
Log.info("&lm[{1}] &lc{0} has disconnected. &lg&fi({2})", player.name, player.uuid, reason);
player.con.hasDisconnected = true;
}
private static float compound(float speed, float drag){
@@ -709,7 +714,12 @@ public class NetServer implements ApplicationListener{
//iterate through each player
for(int i = 0; i < playerGroup.size(); i++){
Player player = playerGroup.all().get(i);
if(player.isLocal || player.con == null) continue;
if(player.isLocal) continue;
if(player.con == null || !player.con.isConnected()){
onDisconnect(player, "disappeared");
continue;
}
NetConnection connection = player.con;

2
core/src/io/anuke/mindustry/net/NetConnection.java
View File

@@ -22,7 +22,7 @@ public abstract class NetConnection{
/** Timestamp of last recieved snapshot. */
public long lastRecievedClientTime;
public boolean hasConnected, hasBegunConnecting;
public boolean hasConnected, hasBegunConnecting, hasDisconnected;
public float viewWidth, viewHeight, viewX, viewY;
public NetConnection(String address){