From 1c0d148607889286c736ee6dcb701f43a9fafa4a Mon Sep 17 00:00:00 2001 From: Xasmedy <75242213+Xasmedy@users.noreply.github.com> Date: Sun, 7 Feb 2021 00:13:48 +0100 Subject: [PATCH 1/2] Removed same if statement. (#4607) Removed an if statement that was the same of the one up. --- core/src/mindustry/net/Net.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index dc7431d0d4..85499dd1d2 100644 --- a/core/src/mindustry/net/Net.java +++ b/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()); From f90f611a6d2a6e1be321227b878bbd46c86bc338 Mon Sep 17 00:00:00 2001 From: Leonid Skorospelov Date: Sun, 7 Feb 2021 14:14:19 +0000 Subject: [PATCH 2/2] plastanium-wall-large schematicPriority should also be 10 (#4613) plastanium-wall has it, makes sense to put for large one as well --- core/src/mindustry/content/Blocks.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e0b3a697dd..eb6e6894a1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/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"){{