From 4c55dbe2a62132c4bdccd2b8e8d32611a89e93d3 Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Wed, 11 Jan 2017 08:20:52 -0800 Subject: [PATCH] Fixes bug with IWILLGC qdel hint This came up in testing, this doesn't set the object in such a way that qdeleted() returns true. --- code/controllers/subsystem/garbage.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 6d24e127294..1ce68f5a65c 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -170,7 +170,9 @@ var/datum/subsystem/garbage_collector/SSgarbage switch(hint) if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. SSgarbage.QueueForQueuing(D) - if (QDEL_HINT_LETMELIVE, QDEL_HINT_IWILLGC) //qdel should let the object live after calling destory. + if (QDEL_HINT_IWILLGC) + return + if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory. if(!force) D.gc_destroyed = null //clear the gc variable (important!) return