From b045d7ae4c4921adf694b44a82b1af1cc975cc53 Mon Sep 17 00:00:00 2001 From: Leshana Date: Fri, 17 Mar 2017 00:33:25 -0400 Subject: [PATCH] Fix runtime in mob controller loop. * Any nulls present in the mob_list would cause a runtime when checked if they are gcDestroyed. Add a null check. * Noticed that the object controller has the same bug, might as well fix now too. --- code/controllers/Processes/mob.dm | 2 +- code/controllers/Processes/obj.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/Processes/mob.dm b/code/controllers/Processes/mob.dm index b44842036d9..8681803ac44 100644 --- a/code/controllers/Processes/mob.dm +++ b/code/controllers/Processes/mob.dm @@ -14,7 +14,7 @@ /datum/controller/process/mob/doWork() for(last_object in mob_list) var/mob/M = last_object - if(isnull(M.gcDestroyed)) + if(M && isnull(M.gcDestroyed)) try M.Life() catch(var/exception/e) diff --git a/code/controllers/Processes/obj.dm b/code/controllers/Processes/obj.dm index bd50edd1113..1010c8cc977 100644 --- a/code/controllers/Processes/obj.dm +++ b/code/controllers/Processes/obj.dm @@ -11,7 +11,7 @@ /datum/controller/process/obj/doWork() for(last_object in processing_objects) var/datum/O = last_object - if(isnull(O.gcDestroyed)) + if(O && isnull(O.gcDestroyed)) try O:process() catch(var/exception/e)