Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -797,6 +797,7 @@ public class Blocks implements ContentList{
             size = 2;
             insulated = true;
             absorbLasers = true;
+            schematicPriority = 10;
         }};
 
         thoriumWall = new Wall("thorium-wall"){{

core/src/mindustry/net/Net.java

@@ -274,9 +274,7 @@ public class Net{
     public void handleServerReceived(NetConnection connection, Object object){
 
         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);
         }else{
             Log.err("Unhandled packet type: '@'!", object.getClass());