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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-02-07 09:50:37 -05:00
parent 8a248dc787 f90f611a6d
commit ae92813169
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+1
View File
@@ -797,6 +797,7 @@ public class Blocks implements ContentList{
size = 2; size = 2;
insulated = true; insulated = true;
absorbLasers = true; absorbLasers = true;
schematicPriority = 10;
}}; }};
thoriumWall = new Wall("thorium-wall"){{ thoriumWall = new Wall("thorium-wall"){{
core/src/mindustry/net/Net.java
-2
View File
@@ -273,10 +273,8 @@ public class Net{
*/ */
public void handleServerReceived(NetConnection connection, Object object){ 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); serverListeners.get(object.getClass()).get(connection, object);
}
Pools.free(object); Pools.free(object);
}else{ }else{
Log.err("Unhandled packet type: '@'!", object.getClass()); Log.err("Unhandled packet type: '@'!", object.getClass());