cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 04:26:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes runtime when building things with proxy sensors that get deleted in the process (#70786)

Browse Source 
proximity_monitor.set_host() was being called after being deleted (qdel -> movetonullspace -> dropped())
This commit is contained in:
ShizCalev
2022-10-27 15:43:17 -04:00
committed by GitHub
parent 3867fdeb85
commit da832d269a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/proximity.dm
+3 -2
View File
@@ -21,7 +21,8 @@
/obj/item/assembly/prox_sensor/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
QDEL_NULL(proximity_monitor)
return ..()
/obj/item/assembly/prox_sensor/examine(mob/user)
. = ..()
@@ -44,7 +45,7 @@
// assembly holder's attached object
// assembly holder itself
// us
proximity_monitor.set_host(connected?.holder || holder?.master || holder || src, src)
proximity_monitor?.set_host(connected?.holder || holder?.master || holder || src, src)
/obj/item/assembly/prox_sensor/on_attach()
. = ..()