Merge pull request #3905 from Citadel-Station-13/upstream-merge-32570

[MIRROR] Checks for nulls in weakrefs
2017-11-14 14:58:07 -06:00
parent c3b60e502e 083100a4df
commit 9c7da6a133
1 changed files with 1 additions and 1 deletions
@@ -16,4 +16,4 @@

 /datum/weakref/proc/resolve()
 	var/datum/D = locate(reference)
-	return D.weak_reference == src? D : null
+	return (!QDELETED(D) && D.weak_reference == src) ? D : null