From 179adabd56109944203eff433329f61c6ecc558e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 3 May 2024 15:57:22 -0400
Subject: [PATCH] Fixed #9804

---
 core/src/mindustry/content/Fx.java               |  9 +++------
 .../entities/abilities/ForceFieldAbility.java    | 16 +++++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java
index 246eec104a..1e8579f4b7 100644
--- a/core/src/mindustry/content/Fx.java
+++ b/core/src/mindustry/content/Fx.java
@@ -2434,12 +2434,9 @@ public class Fx{
     shieldBreak = new Effect(40, e -> {
         color(e.color);
         stroke(3f * e.fout());
-        if(e.data instanceof Unit u){
-            var ab = (ForceFieldAbility)Structs.find(u.abilities, a -> a instanceof ForceFieldAbility);
-            if(ab != null){
-                Lines.poly(e.x, e.y, ab.sides, e.rotation + e.fin(), ab.rotation);
-                return;
-            }
+        if(e.data instanceof ForceFieldAbility ab){
+            Lines.poly(e.x, e.y, ab.sides, e.rotation + e.fin(), ab.rotation);
+            return;
         }
 
         Lines.poly(e.x, e.y, 6, e.rotation + e.fin());
diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
index f391156adb..8ec26ff44a 100644
--- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java
+++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java
@@ -32,6 +32,7 @@ public class ForceFieldAbility extends Ability{
 
     /** State. */
     protected float radiusScale, alpha;
+    protected boolean wasBroken;
 
     private static float realRad;
     private static Unit paramUnit;
@@ -41,13 +42,6 @@ public class ForceFieldAbility extends Ability{
             trait.absorb();
             Fx.absorb.at(trait);
 
-            //break shield
-            if(paramUnit.shield <= trait.damage()){
-                paramUnit.shield -= paramField.cooldown * paramField.regen;
-
-                Fx.shieldBreak.at(paramUnit.x, paramUnit.y, paramField.radius, paramUnit.team.color, paramUnit);
-            }
-
             paramUnit.shield -= trait.damage();
             paramField.alpha = 1f;
         }
@@ -85,6 +79,14 @@ public class ForceFieldAbility extends Ability{
 
     @Override
     public void update(Unit unit){
+        if(unit.shield <= 0f && !wasBroken){
+            unit.shield -= cooldown * regen;
+
+            Fx.shieldBreak.at(unit.x, unit.y, radius, unit.team.color, this);
+        }
+
+        wasBroken = unit.shield <= 0f;
+
         if(unit.shield < max){
             unit.shield += Time.delta * regen;
         }