From 06f9aa5f844191a1a56c7c81ad8733e355d47716 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Oct 2020 15:35:26 -0400
Subject: [PATCH] things

---
 core/src/mindustry/content/Blocks.java                        | 4 ++--
 core/src/mindustry/content/UnitTypes.java                     | 4 ++--
 core/src/mindustry/mod/ContentParser.java                     | 2 +-
 .../src/mindustry/world/blocks/distribution/OverflowGate.java | 1 +
 core/src/mindustry/world/blocks/storage/CoreBlock.java        | 2 ++
 gradle.properties                                             | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b3ff2389c2..2eee8353e2 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -757,14 +757,14 @@ public class Blocks implements ContentList{
 
         plastaniumWall = new Wall("plastanium-wall"){{
             requirements(Category.defense, with(Items.plastanium, 5, Items.metaglass, 2));
-            health = 190 * wallHealthMultiplier;
+            health = 130 * wallHealthMultiplier;
             insulated = true;
             absorbLasers = true;
         }};
 
         plastaniumWallLarge = new Wall("plastanium-wall-large"){{
             requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4));
-            health = 190 * wallHealthMultiplier * 4;
+            health = 130 * wallHealthMultiplier * 4;
             size = 2;
             insulated = true;
             absorbLasers = true;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 3fd037f208..d301b52652 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -519,7 +519,7 @@ public class UnitTypes implements ContentList{
         crawler = new UnitType("crawler"){{
             defaultController = SuicideAI::new;
 
-            speed = 0.85f;
+            speed = 0.9f;
             hitSize = 8f;
             health = 180;
             mechSideSway = 0.25f;
@@ -536,7 +536,7 @@ public class UnitTypes implements ContentList{
                     speed = 1f;
                     splashDamageRadius = 55f;
                     instantDisappear = true;
-                    splashDamage = 55f;
+                    splashDamage = 60f;
                     killShooter = true;
                     hittable = false;
                     collidesAir = true;
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index db68d81bd1..9cc9535ee1 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -542,7 +542,7 @@ public class ContentParser{
     }
 
     void checkNullFields(Object object){
-        if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return;
+        if(object == null || object instanceof Number || object instanceof String || toBeParsed.contains(object) || object.getClass().getName().startsWith("arc.")) return;
 
         parser.getFields(object.getClass()).values().toSeq().each(field -> {
             try{
diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
index 63b57c1329..1b38cff775 100644
--- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java
@@ -23,6 +23,7 @@ public class OverflowGate extends Block{
         instantTransfer = true;
         unloadable = false;
         canOverdrive = false;
+        itemCapacity = 1;
     }
 
     @Override
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index ccd3da5a43..372042b5bc 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -75,6 +75,8 @@ public class CoreBlock extends StorageBlock{
     public void setStats(){
         super.setStats();
 
+        stats.add(BlockStat.buildTime, 0, StatUnit.seconds);
+
         bars.add("capacity", (CoreBuild e) ->
             new Bar(
                 () -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)),
diff --git a/gradle.properties b/gradle.properties
index 21a53caea2..b4210058e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=7d3ae40af604e0c0dfa1e01bb563675732b111a4
+archash=6fca97cecdf28a696b2c19097f70960485a62743