Method refactoring / Cleanup

2020-05-30 12:11:00 -04:00
parent 8d0486d425
commit d988b4b5c9
13 changed files with 41 additions and 23 deletions
--- a/core/src/mindustry/entities/comp/HealthComp.java
+++ b/core/src/mindustry/entities/comp/HealthComp.java
@@ -2,7 +2,6 @@ package mindustry.entities.comp;

 import arc.math.*;
 import arc.util.*;
-import mindustry.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;

@@ -53,7 +52,7 @@ abstract class HealthComp implements Entityc{
    /** Damage and pierce armor. */
    void damagePierce(float amount, boolean withEffect){
        if(this instanceof Shieldc){
-            damage(amount / Math.max(1f - ((Shieldc)this).armor(), Vars.minArmorDamage), withEffect);
+            damage(amount + ((Shieldc)this).armor(), withEffect);
        }else{
            damage(amount, withEffect);
        }