Fixed #4071

2020-12-22 11:20:35 -05:00
parent 24c71e49c7
commit 17177f87aa
2 changed files with 16 additions and 6 deletions
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -26,8 +26,22 @@ abstract class ShieldComp implements Healthc, Posc{
        amount = Math.max(amount - armor, minArmorDamage * amount);
        amount /= healthMultiplier;

-        hitTime = 1f;
+        rawDamage(amount);
+    }

+    @Replace
+    @Override
+    public void damagePierce(float amount, boolean withEffect){
+        float pre = hitTime;
+
+        rawDamage(amount);
+
+        if(!withEffect){
+            hitTime = pre;
+        }
+    }
+
+    private void rawDamage(float amount){
        boolean hadShields = shield > 0.0001f;

        if(hadShields){