From b3cddb0d82d4d8d8736ff81fae8d543e8ac69b4f Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Fri, 3 Nov 2023 19:19:49 +0400
Subject: [PATCH] uncap fsh shield damage (#9230)

---
 core/src/mindustry/entities/bullet/BulletType.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 7edb314973..b4c632ab98 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -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);