From 16a7f4dc017606a80ac088513a767558c19f5467 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 28 Oct 2021 17:05:21 +0100 Subject: [PATCH] [MIRROR] Fix runtime on physical experiments' unregister_events() running on null [MDB IGNORE] (#9101) * fix unregister_events() running on null (#62356) the unregister_events() proc is used to stop listening for a signal from a previously scanned atom for experiment purposes. if the experi-scanner wasn't used for scanning atoms for physical experiments previously, it would cause a runtime, trying to unregister a signal from a non-existant atom. * Fix runtime on physical experiments' unregister_events() running on null Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com> --- code/modules/experisci/experiment/types/physical_experiment.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/experisci/experiment/types/physical_experiment.dm b/code/modules/experisci/experiment/types/physical_experiment.dm index 5e692931c5b..97f7452085b 100644 --- a/code/modules/experisci/experiment/types/physical_experiment.dm +++ b/code/modules/experisci/experiment/types/physical_experiment.dm @@ -13,7 +13,8 @@ return completed /datum/experiment/physical/perform_experiment_actions(datum/component/experiment_handler/experiment_handler, atom/target) - unregister_events() + if(currently_scanned_atom) + unregister_events() currently_scanned_atom = target linked_experiment_handler = experiment_handler if(register_events())