From 5ad2807958618241b91757414664fdd7b732631f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 30 Jul 2020 19:59:31 -0400
Subject: [PATCH] Fixed #2287

---
 core/src/mindustry/content/SectorPresets.java     |  2 +-
 core/src/mindustry/content/UnitTypes.java         | 10 +++++-----
 core/src/mindustry/entities/Predict.java          |  1 +
 core/src/mindustry/entities/comp/BuilderComp.java |  4 ++++
 core/src/mindustry/entities/comp/MinerComp.java   |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index 6f069d29ed..18f2248dec 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -22,7 +22,7 @@ public class SectorPresets implements ContentList{
             conditionWave = 5;
             launchPeriod = 5;
             rules = r -> {
-                r.winWave = 20;
+                r.winWave = 10;
             };
         }};
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index cae6808fd6..a734b44a0d 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -872,12 +872,12 @@ public class UnitTypes implements ContentList{
             rotateSpeed = 15f;
             accel = 0.1f;
             itemCapacity = 30;
-            health = 80f;
+            health = 120f;
             engineOffset = 6f;
             hitsize = 8f;
 
             weapons.add(new Weapon("small-basic-weapon"){{
-                reload = 20f;
+                reload = 17f;
                 x = 2.75f;
                 y = 1f;
 
@@ -887,7 +887,7 @@ public class UnitTypes implements ContentList{
                     lifetime = 60f;
                     shootEffect = Fx.shootSmall;
                     smokeEffect = Fx.shootSmallSmoke;
-                    tileDamageMultiplier = 0.1f;
+                    tileDamageMultiplier = 0.95f;
                 }};
             }});
         }};
@@ -906,7 +906,7 @@ public class UnitTypes implements ContentList{
             rotateSpeed = 17f;
             accel = 0.1f;
             itemCapacity = 50;
-            health = 120f;
+            health = 150f;
             engineOffset = 6f;
             hitsize = 9f;
             rotateShooting = false;
@@ -946,7 +946,7 @@ public class UnitTypes implements ContentList{
             rotateSpeed = 19f;
             accel = 0.11f;
             itemCapacity = 70;
-            health = 160f;
+            health = 190f;
             engineOffset = 6f;
             hitsize = 10f;
 
diff --git a/core/src/mindustry/entities/Predict.java b/core/src/mindustry/entities/Predict.java
index 03c41e5778..fb31bf5ea6 100644
--- a/core/src/mindustry/entities/Predict.java
+++ b/core/src/mindustry/entities/Predict.java
@@ -57,6 +57,7 @@ public class Predict{
             ddx += ((Hitboxc)dst).deltaX();
             ddy += ((Hitboxc)dst).deltaY();
         }
+        Log.info("attach dst = @, @ @", dst, ddx, ddy);
         if(src instanceof Hitboxc){
             ddx -= ((Hitboxc)src).deltaX()/(Time.delta);
             ddy -= ((Hitboxc)src).deltaY()/(Time.delta);
diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index b62a4d62e1..694686a2e1 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -200,6 +200,10 @@ abstract class BuilderComp implements Unitc{
         }
     }
 
+    boolean activelyBuilding(){
+        return isBuilding() && updateBuilding;
+    }
+
     /** Return the build request currently active, or the one at the top of the queue.*/
     @Nullable
     BuildPlan buildPlan(){
diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java
index 23b566c534..12711abe2e 100644
--- a/core/src/mindustry/entities/comp/MinerComp.java
+++ b/core/src/mindustry/entities/comp/MinerComp.java
@@ -51,7 +51,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
         }
 
         if(mineTile == null || core == null || mineTile.block() != Blocks.air || dst(mineTile.worldx(), mineTile.worldy()) > miningRange
-        || (((Object)this) instanceof Builderc && ((Builderc)(Object)this).isBuilding())
+        || (((Object)this) instanceof Builderc && ((Builderc)(Object)this).activelyBuilding())
         || mineTile.drop() == null || !acceptsItem(mineTile.drop()) || !canMine(mineTile.drop())){
             mineTile = null;
             mineTimer = 0f;