Fixes /datum/Beam failing to GC (#23285)

This commit is contained in:
Cyberboss
2017-01-26 03:39:55 -05:00
committed by AnturK
parent a172e6d357
commit d338467755
4 changed files with 20 additions and 7 deletions

View File

@@ -20,6 +20,11 @@
..()
START_PROCESSING(SSobj, src)
/obj/item/weapon/gun/medbeam/Destroy(mob/user)
STOP_PROCESSING(SSobj, src)
LoseTarget()
return ..()
/obj/item/weapon/gun/medbeam/dropped(mob/user)
..()
LoseTarget()
@@ -31,6 +36,7 @@
/obj/item/weapon/gun/medbeam/proc/LoseTarget()
if(active)
qdel(current_beam)
current_beam = null
active = 0
on_beam_release(current_target)
current_target = null
@@ -45,7 +51,7 @@
return
current_target = target
active = 1
active = TRUE
current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
addtimer(CALLBACK(current_beam, /datum/beam.proc/Start), 0)