Merge pull request #7027 from Citadel-Station-13/upstream-merge-38301

[MIRROR] Fixes infrared emmiters partially.
2018-06-09 05:25:54 +00:00
parent 38878094bc 0e3d5a7512
commit 4241ef321e
1 changed files with 4 additions and 1 deletions
@@ -33,6 +33,7 @@

 /obj/item/assembly/infra/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(listener)
 	QDEL_LIST(beams)
 	. = ..()

@@ -166,7 +167,9 @@
 	listener = newloc.AddComponent(/datum/component/redirect, COMSIG_ATOM_EXITED, CALLBACK(src, .proc/check_exit))

 /obj/item/assembly/infra/proc/check_exit(atom/movable/offender)
-	if(offender && ((offender.flags_1 & ABSTRACT_1) || offender == src))
+	if(QDELETED(src))
+		return
+	if(offender == src || istype(offender,/obj/effect/beam/i_beam))
 		return
 	return refreshBeam()