Makes Initialize check QDELETED before calling (#24818)

* Makes Initialize check QDELETED before calling

* uhh

* Warnings
This commit is contained in:
Cyberboss
2017-03-10 12:03:15 +13:00
committed by oranges
parent 0f1b329d86
commit ffbb492a43
2 changed files with 9 additions and 1 deletions
+7 -1
View File
@@ -34,6 +34,9 @@ var/datum/controller/subsystem/atoms/SSatoms
for(var/I in atoms)
var/atom/A = I
if(!A.initialized) //this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
if(QDELETED(A))
stack_trace("Found new qdeletion in type [A.type]!")
continue
var/start_tick = world.time
if(A.Initialize(TRUE))
LAZYADD(late_loaders, A)
@@ -47,6 +50,9 @@ var/datum/controller/subsystem/atoms/SSatoms
#endif
for(var/atom/A in world)
if(!A.initialized) //this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
if(QDELETED(A))
stack_trace("Found new qdeletion in type [A.type]!")
continue
var/start_tick = world.time
if(A.Initialize(TRUE))
LAZYADD(late_loaders, A)
@@ -101,4 +107,4 @@ var/datum/controller/subsystem/atoms/SSatoms
bad_mutations |= B
else if(B.quality == MINOR_NEGATIVE)
not_good_mutations |= B
CHECK_TICK
CHECK_TICK