From 4d6c8ade987f21e400ad2adbf6b2ee25ea118b43 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 12 Sep 2020 23:41:25 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/content/Blocks.java                     | 2 +-
 core/src/mindustry/entities/bullet/ShrapnelBulletType.java | 1 +
 core/src/mindustry/type/UnitType.java                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 3298961b11..a8a2d3e19f 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1565,6 +1565,7 @@ public class Blocks implements ContentList{
         segment = new PointDefenseTurret("segment"){{
             requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 40));
 
+            health = 250 * size * size;
             range = 140f;
             hasPower = true;
             consumes.power(3f);
@@ -1572,7 +1573,6 @@ public class Blocks implements ContentList{
             shootLength = 5f;
             bulletDamage = 25f;
             reloadTime = 10f;
-            health = 190 * size * size;
         }};
 
         fuse = new ItemTurret("fuse"){{
diff --git a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
index a6a9ca6be0..0d58e683d2 100644
--- a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
+++ b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
@@ -25,6 +25,7 @@ public class ShrapnelBulletType extends BulletType{
         despawnEffect = Fx.none;
         pierce = true;
         keepVelocity = false;
+        hittable = false;
     }
 
     @Override
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 458d23ac6c..b9e768032f 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -612,7 +612,7 @@ public class UnitType extends UnlockableContent{
         float e = unit.elevation;
 
         float sin = Mathf.lerp(Mathf.sin(walkExtend(mech, true), 2f / Mathf.PI, 1f), 0f, e);
-        float extension = walkExtend(mech, false);
+        float extension = Mathf.lerp(walkExtend(mech, false), 0, e);
         float boostTrns = e * 2f;
 
         Floor floor = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn();