Bugfix related to null particle effect

ari-steas · Oct 16, 2024 · f3827ff · f3827ff
1 parent 0e876dd
commit f3827ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Orrery Combat Framework - Heart Module/Data/Scripts/HeartModule/Projectiles/ProjectileFx.cs b/Orrery Combat Framework - Heart Module/Data/Scripts/HeartModule/Projectiles/ProjectileFx.cs
@@ -76,7 +76,7 @@ public void DrawUpdate()
             {
                 if (ProjectileEffect == null)
                     MyParticlesManager.TryCreateParticleEffect(Definition.Visual.AttachedParticle, ref MatrixD.Identity, ref Vector3D.Zero, RenderId, out ProjectileEffect);
-                if (RenderId == uint.MaxValue)
+                if (RenderId == uint.MaxValue && ProjectileEffect != null)
                     ProjectileEffect.WorldMatrix = ProjectileMatrix;
             }
 

diff --git a/...Combat Framework - Heart Module/Data/Scripts/HeartModule/Projectiles/ProjectileManager.cs b/...Combat Framework - Heart Module/Data/Scripts/HeartModule/Projectiles/ProjectileManager.cs
@@ -96,8 +96,15 @@ public override void Draw() // Called once per frame to avoid jitter
             if (HeartData.I.IsSuspended || MyAPIGateway.Utilities.IsDedicated) // We don't want to needlessly use server CPU time
                 return;
 
-            foreach (var projectile in ActiveProjectiles.Values)
-                projectile.DrawUpdate(); // Draw delta is always 1/60 because Keen:tm:
+            try
+            {
+                foreach (var projectile in ActiveProjectiles.Values)
+                    projectile.DrawUpdate(); // Draw delta is always 1/60 because Keen:tm:
+            }
+            catch (Exception ex)
+            {
+                HeartLog.LogException(ex, typeof(ProjectileManager));
+            }
         }
 
         [Obsolete]