Merge pull request #392 from Panxuc/dev

fix: 🐛 wormhole keep killing, construction not zero
eesast · May 22, 2024 · af2639e · af2639e
2 parents 5fc1a38 + fc520f2
commit af2639e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/logic/GameClass/GameObj/Areas/Construction.cs b/logic/GameClass/GameObj/Areas/Construction.cs
@@ -70,8 +70,6 @@ public bool BeAttacked(Bullet bullet)
         }
         if (HP == 0)
         {
-            lock (lockOfConstructionType)
-                constructionType = ConstructionType.Null;
             IsActivated.Set(false);
         }
         return HP.IsBelowMaxTimes(0.5);

diff --git a/logic/Gaming/AttackManager.cs b/logic/Gaming/AttackManager.cs
@@ -106,8 +106,9 @@ private void BombObj(Bullet bullet, GameObj objBeingShot)
                         }
                         break;
                     case GameObjType.Wormhole:
+                        var previousHP = ((WormholeCell)objBeingShot).Wormhole.HP;
                         ((WormholeCell)objBeingShot).Wormhole.BeAttacked(bullet);
-                        if (((WormholeCell)objBeingShot).Wormhole.HP < GameData.WormholeHP / 2)
+                        if (previousHP >= GameData.WormholeHP / 2 && ((WormholeCell)objBeingShot).Wormhole.HP < GameData.WormholeHP / 2)
                         {
                             var shipList = gameMap.ShipInTheList(((WormholeCell)objBeingShot).Wormhole.Cells);
                             if (shipList != null)