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

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2020-11-09 12:45:34 -05:00
parent 548dc79fb0 2ae9be6335
commit 43e6da0fed
41 changed files with 126 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,8 +254,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);

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());