Fix #258: Fix the exceptions that are occuring

cheeeeeeeeeen · Oct 15, 2021 · fbcf066 · fbcf066
1 parent 358e5c2
commit fbcf066
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/GradiusHelper.cs b/GradiusHelper.cs
@@ -323,7 +323,7 @@ public static int FindTarget(Projectile projectile, Vector2 ownPosition, float r
                 float enemyDistance = Vector2.Distance(ownPosition, selectNpc.Center);
 
                 if (enemyDistance <= range && distance < shortestDistance && selectNpc.CanBeChasedBy() &&
-                    (selectNpc.modNPC.CanBeHitByProjectile(projectile) ?? true) &&
+                    (NPCLoader.CanBeHitByProjectile(selectNpc, projectile) ?? true) &&
                     (!needLineOfSight || Collision.CanHit(projectile.Center, 1, 1, selectNpc.Center, 1, 1)))
                 {
                     shortestDistance = distance;

diff --git a/Projectiles/Melee/AlliedZalk.cs b/Projectiles/Melee/AlliedZalk.cs
@@ -39,8 +39,12 @@ public override void SetDefaults()
 
         public override void AI()
         {
-            AnimateSprite();
-            Movement();
+            if (IsMotherValid)
+            {
+                AnimateSprite();
+                Movement();
+            }
+            else projectile.Kill();
         }
 
         public override void Kill(int timeLeft)
@@ -49,7 +53,7 @@ public override void Kill(int timeLeft)
                                 mod.GetGoreSlot("Gores/GradiusExplode"), .5f);
             Main.PlaySound(mod.GetLegacySoundSlot(SoundType.Custom, "Sounds/Enemies/Gradius2Death"),
                            projectile.Center);
-            ActualMotherProjectile.alliedZalks.Remove(projectile);
+            if (IsMotherValid) ActualMotherProjectile.alliedZalks.Remove(projectile);
         }
 
         private void AnimateSprite()
@@ -81,5 +85,7 @@ private void Movement()
         private ZalkYoyoProjectile ActualMotherProjectile => MotherProjectile.modProjectile as ZalkYoyoProjectile;
 
         private int Numbering => ActualMotherProjectile.alliedZalks.IndexOf(projectile);
+
+        private bool IsMotherValid => MotherProjectile.active && ActualMotherProjectile != null;
     }
 }