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

Great cleanup

Browse Source
This commit is contained in:
Skat
2020-11-07 11:37:46 +03:00
parent 29b8db0a85
commit ed36390f3c
45 changed files with 134 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/net/Administration.java
View File

@@ -256,8 +256,7 @@ public class Administration{
public boolean unbanPlayerID(String id){
PlayerInfo info = getCreateInfo(id);
if(!info.banned)
return false;
if(!info.banned) return false;
info.banned = false;
bannedIPs.removeAll(info.ips, false);
@@ -551,8 +550,8 @@ public class Administration{
}
return info != null || ips != null || whitelist != null || subnet != null;
}catch(Throwable e){
e.printStackTrace();
}catch(Throwable t){
Log.err(t);
}
return false;
}

6
core/src/mindustry/net/Net.java
View File

@@ -254,8 +254,9 @@ public class Net{
}else if(clientListeners.get(object.getClass()) != null){
if(clientLoaded || ((object instanceof Packet) && ((Packet)object).isImportant())){
if(clientListeners.get(object.getClass()) != null)
if(clientListeners.get(object.getClass()) != null){
clientListeners.get(object.getClass()).get(object);
}
Pools.free(object);
}else if(!((object instanceof Packet) && ((Packet)object).isUnimportant())){
packetQueue.add(object);
@@ -273,8 +274,9 @@ public class Net{
public void handleServerReceived(NetConnection connection, Object object){
if(serverListeners.get(object.getClass()) != null){
if(serverListeners.get(object.getClass()) != null)
if(serverListeners.get(object.getClass()) != null){
serverListeners.get(object.getClass()).get(connection, object);
}
Pools.free(object);
}else{
Log.err("Unhandled packet type: '@'!", object.getClass());