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

Fixed unnecessary disconnect messages / Fixed player ban crash

Browse Source
This commit is contained in:
Anuken
2018-07-19 09:30:58 -04:00
parent 363bf7c552
commit 4d88a8206a
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,30 +45,20 @@ public class NetServer extends Module{
private final static byte[] reusableSnapArray = new byte[maxSnapshotSize]; private final static byte[] reusableSnapArray = new byte[maxSnapshotSize];
private final static float serverSyncTime = 4, kickDuration = 30 * 1000; private final static float serverSyncTime = 4, kickDuration = 30 * 1000;
private final static Vector2 vector = new Vector2(); private final static Vector2 vector = new Vector2();
/** /**If a play goes away of their server-side coordinates by this distance, they get teleported back.*/
* If a play goes away of their server-side coordinates by this distance, they get teleported back.
*/
private final static float correctDist = 16f; private final static float correctDist = 16f;
public final Administration admins = new Administration(); public final Administration admins = new Administration();
/** /**Maps connection IDs to players.*/
* Maps connection IDs to players.
*/
private IntMap<Player> connections = new IntMap<>(); private IntMap<Player> connections = new IntMap<>();
private boolean closing = false; private boolean closing = false;
/** /**Stream for writing player sync data to.*/
* Stream for writing player sync data to.
*/
private CountableByteArrayOutputStream syncStream = new CountableByteArrayOutputStream(); private CountableByteArrayOutputStream syncStream = new CountableByteArrayOutputStream();
/** /**Data stream for writing player sync data to.*/
* Data stream for writing player sync data to.
*/
private DataOutputStream dataStream = new DataOutputStream(syncStream); private DataOutputStream dataStream = new DataOutputStream(syncStream);
/** /**Encoder for computing snapshot deltas.*/
* Encoder for computing snapshot deltas.
*/
private DEZEncoder encoder = new DEZEncoder(); private DEZEncoder encoder = new DEZEncoder();
public NetServer(){ public NetServer(){
@ -278,8 +268,10 @@ public class NetServer extends Module{
} }
public static void onDisconnect(Player player){ public static void onDisconnect(Player player){
Call.sendMessage("[accent]" + player.name + " has disconnected."); if(player.con.hasConnected){
Call.onPlayerDisconnect(player.id); Call.sendMessage("[accent]" + player.name + " has disconnected.");
Call.onPlayerDisconnect(player.id);
}
player.remove(); player.remove();
netServer.connections.remove(player.con.id); netServer.connections.remove(player.con.id);
} }
@ -358,13 +350,14 @@ public class NetServer extends Module{
Log.info("Kicking connection #{0} / IP: {1}. Reason: {2}", connection, con.address, reason); Log.info("Kicking connection #{0} / IP: {1}. Reason: {2}", connection, con.address, reason);
} }
if((reason == KickReason.kick || reason == KickReason.banned) && admins.getTraceByID(getUUID(con.id)).uuid != null){ Player player = connections.get(con.id);
if(player != null && (reason == KickReason.kick || reason == KickReason.banned) && admins.getTraceByID(getUUID(con.id)).uuid != null){
PlayerInfo info = admins.getInfo(admins.getTraceByID(getUUID(con.id)).uuid); PlayerInfo info = admins.getInfo(admins.getTraceByID(getUUID(con.id)).uuid);
info.timesKicked++; info.timesKicked++;
info.lastKicked = TimeUtils.millis(); info.lastKicked = TimeUtils.millis();
} }
//TODO kick player, send kick packet
Call.onKick(connection, reason); Call.onKick(connection, reason);
Timers.runTask(2f, con::close); Timers.runTask(2f, con::close);

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

@ -161,7 +161,7 @@ public class Administration{
} }
/** /**
* Returns trace info by IP. * Returns trace info by UUID.
*/ */
public TraceInfo getTraceByID(String uuid){ public TraceInfo getTraceByID(String uuid){
if(!traceInfo.containsKey(uuid)) traceInfo.put(uuid, new TraceInfo(uuid)); if(!traceInfo.containsKey(uuid)) traceInfo.put(uuid, new TraceInfo(uuid));