fix blob core system

Rxup · Aug 20, 2024 · 6ee58f1 · 6ee58f1
1 parent 66da962
commit 6ee58f1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Content.Server/Backmen/Blob/BlobCoreSystem.cs b/Content.Server/Backmen/Blob/BlobCoreSystem.cs
@@ -267,16 +267,17 @@ private void OnDestruction(EntityUid uid, BlobCoreComponent component, Destructi
 
         if (isAllDie <= 1)
         {
-            var blobFactoryQuery = EntityQueryEnumerator<BlobRuleComponent>();
-            while (blobFactoryQuery.MoveNext(out _, out var blobRuleComp))
+            var blobRuleQuery = EntityQueryEnumerator<BlobRuleComponent>();
+            while (blobRuleQuery.MoveNext(out _, out var blobRuleComp))
             {
-                if (blobRuleComp.Stage != BlobStage.TheEnd ||
-                    blobRuleComp.Stage != BlobStage.Default)
-                {
-                    _alertLevelSystem.SetLevel(stationUid!.Value, "green", true, true, true);
-                    _roundEndSystem.CancelRoundEndCountdown(null, false);
-                    blobRuleComp.Stage = BlobStage.Default;
-                }
+                if (blobRuleComp.Stage == BlobStage.TheEnd ||
+                    blobRuleComp.Stage == BlobStage.Default ||
+                    stationUid == null)
+                    continue;
+
+                _alertLevelSystem.SetLevel(stationUid.Value, "green", true, true, true);
+                _roundEndSystem.CancelRoundEndCountdown(null, false);
+                blobRuleComp.Stage = BlobStage.Default;
             }
         }
         QueueDel(uid);

diff --git a/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/blob.yml b/Resources/Prototypes/_Backmen/Entities/Mobs/NPCs/blob.yml
@@ -385,7 +385,8 @@
         state: blob_core_glow
 #        shader: unshaded
       - state: blob_core_overlay
-
+  - type: WarpPoint
+    location: blob core
 
 - type: entity
   parent: CoreBlobTile