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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-11-03 18:56:10 -04:00
parent 2aaa861755 b3cddb0d82
commit 318ff1b5ad
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -386,9 +386,13 @@ public class BulletType extends Content implements Cloneable{
if(entity instanceof Healthc h){
float damage = b.damage;
if(maxDamageFraction > 0){
damage = Math.min(damage, h.maxHealth() * maxDamageFraction);
float cap = h.maxHealth() * maxDamageFraction;
if(entity instanceof Shieldc s){
cap += Math.max(s.shield(), 0f);
}
damage = Math.min(damage, cap);
//cap health to effective health for handlePierce to handle it properly
health = Math.min(health, h.maxHealth() * maxDamageFraction);
health = Math.min(health, cap);
}
if(pierceArmor){
h.damagePierce(damage);