From 7c1539aa2bb408486c98df862da1aad64a39f20c Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Sat, 7 Dec 2024 01:48:57 +0300 Subject: [PATCH] [NO GBP] Fixes an edge case with meteor moveloop code (#88229) ## About The Pull Request This felt like an infinite delete trap so I've tested it and didn't find anything but there's a couple of qdel loop traces in server logs, I think this happens if something destroys the meteor? ## Changelog :cl: fix: Fixed an edge case with meteor moveloop code /:cl: --- code/modules/meteors/meteor_types.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm index 287a93821ae..8d3fcc67f53 100644 --- a/code/modules/meteors/meteor_types.dm +++ b/code/modules/meteors/meteor_types.dm @@ -45,6 +45,9 @@ /obj/effect/meteor/Destroy() GLOB.meteor_list -= src + var/datum/move_loop/moveloop = GLOB.move_manager.processing_on(src, SSmovement) + if (!isnull(moveloop)) + UnregisterSignal(moveloop, COMSIG_MOVELOOP_STOP) return ..() /obj/effect/meteor/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)