From 81509f2e73f5d7afdb20956b01da24f291fdafa7 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:30:02 +0200 Subject: [PATCH] Fixes runtimes caused by energy bolas (#90469) ## About The Pull Request Certain throw impact callbacks, like those on energy bolas, could cause the object to get deleted, which would make throwing datums runtime because they didn't account for it. ## Changelog :cl: fix: Fixed runtimes caused by energy bolas /:cl: --- code/controllers/subsystem/throwing.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 7425dc65efe..83f6e4e4ff8 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -232,6 +232,9 @@ SUBSYSTEM_DEF(throwing) if (callback) callback.Invoke() + // Same can happen in the callback + if(QDELETED(thrownthing)) + return if(!thrownthing.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case. var/turf/T = get_turf(thrownthing)