From 15157be321aa7ef374b345e6298f2cc17b98fccb Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 28 Jun 2020 22:24:54 -0700 Subject: [PATCH] Merge pull request #7311 from Mechoid/FixTimingError Fix timing error that allowed processing to reference a nulled list. --- code/modules/projectiles/projectile.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b0894753b85..5928f0db3d3 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -441,15 +441,15 @@ setAngle(Get_Angle(source, target)) /obj/item/projectile/Destroy() + if(hitscan) + finalize_hitscan_and_generate_tracers() + STOP_PROCESSING(SSprojectiles, src) if(impacted_mobs) if(LAZYLEN(impacted_mobs)) impacted_mobs.Cut() impacted_mobs = null - if(hitscan) - finalize_hitscan_and_generate_tracers() - STOP_PROCESSING(SSprojectiles, src) qdel(trajectory) return ..()