Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #4071

Browse Source
This commit is contained in:
Anuken
2020-12-22 11:20:35 -05:00
parent 24c71e49c7
commit 17177f87aa
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/HealthComp.java
View File

@@ -51,11 +51,7 @@ abstract class HealthComp implements Entityc, Posc{
/** Damage and pierce armor. */ /** Damage and pierce armor. */
void damagePierce(float amount, boolean withEffect){ void damagePierce(float amount, boolean withEffect){
if(this instanceof Shieldc c){ damage(amount, withEffect);
damage(amount + c.armor(), withEffect);
}else{
damage(amount, withEffect);
}
} }
/** Damage and pierce armor. */ /** Damage and pierce armor. */

16
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -26,8 +26,22 @@ abstract class ShieldComp implements Healthc, Posc{
amount = Math.max(amount - armor, minArmorDamage * amount); amount = Math.max(amount - armor, minArmorDamage * amount);
amount /= healthMultiplier; 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; boolean hadShields = shield > 0.0001f;
if(hadShields){ if(hadShields){