cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more Destroy / GC issues.

Browse Source 
Fixes recursive Destroy call on containment field.
Fix unable to GC issue on air alarms.
Fix unable to GC issue on radiation sources.
This commit is contained in:
Leshana
2018-01-21 22:35:22 -05:00
parent c8929d5bdb
commit 00d13c5832
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/repositories/radiation.dm
View File

@@ -18,7 +18,7 @@ var/global/repository/radiation/radiation_repository = new()
/datum/radiation_source/Destroy() /datum/radiation_source/Destroy()
radiation_repository.sources -= src radiation_repository.sources -= src
if(radiation_repository.sources_assoc[src.source_turf] == src) if(radiation_repository.sources_assoc[src.source_turf] == src)
radiation_repository.sources -= src.source_turf radiation_repository.sources_assoc -= src.source_turf
src.source_turf = null src.source_turf = null
. = ..() . = ..()

7
code/game/machinery/alarm.dm
View File

@@ -103,6 +103,9 @@
unregister_radio(src, frequency) unregister_radio(src, frequency)
qdel(wires) qdel(wires)
wires = null wires = null
if(alarm_area && alarm_area.master_air_alarm == src)
alarm_area.master_air_alarm = null
elect_master(exclude_self = TRUE)
return ..() return ..()
/obj/machinery/alarm/New() /obj/machinery/alarm/New()
@@ -271,8 +274,10 @@
/obj/machinery/alarm/proc/master_is_operating() /obj/machinery/alarm/proc/master_is_operating()
return alarm_area && alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER | BROKEN)) return alarm_area && alarm_area.master_air_alarm && !(alarm_area.master_air_alarm.stat & (NOPOWER | BROKEN))
/obj/machinery/alarm/proc/elect_master() /obj/machinery/alarm/proc/elect_master(exclude_self = FALSE)
for(var/obj/machinery/alarm/AA in alarm_area) for(var/obj/machinery/alarm/AA in alarm_area)
if(exclude_self && AA == src)
continue
if(!(AA.stat & (NOPOWER|BROKEN))) if(!(AA.stat & (NOPOWER|BROKEN)))
alarm_area.master_air_alarm = AA alarm_area.master_air_alarm = AA
return 1 return 1

2
code/modules/power/singularity/containment_field.dm
View File

@@ -20,7 +20,7 @@
FG1.cleanup() FG1.cleanup()
if(FG2 && !FG2.clean_up) if(FG2 && !FG2.clean_up)
FG2.cleanup() FG2.cleanup()
..() . = ..()
/obj/machinery/containment_field/attack_hand(mob/user as mob) /obj/machinery/containment_field/attack_hand(mob/user as mob)
if(get_dist(src, user) > 1) if(get_dist(src, user) > 1)

6
code/modules/power/singularity/field_generator.dm
View File

@@ -168,7 +168,7 @@ field_generator power level display
/obj/machinery/field_generator/Destroy() /obj/machinery/field_generator/Destroy()
src.cleanup() src.cleanup()
..() . = ..()
@@ -312,12 +312,12 @@ field_generator power level display
/obj/machinery/field_generator/proc/cleanup() /obj/machinery/field_generator/proc/cleanup()
clean_up = 1 clean_up = 1
for (var/obj/machinery/containment_field/F in fields) for (var/obj/machinery/containment_field/F in fields)
if (isnull(F)) if (QDELETED(F))
continue continue
qdel(F) qdel(F)
fields = list() fields = list()
for(var/obj/machinery/field_generator/FG in connected_gens) for(var/obj/machinery/field_generator/FG in connected_gens)
if (isnull(FG)) if (QDELETED(FG))
continue continue
FG.connected_gens.Remove(src) FG.connected_gens.Remove(src)
if(!FG.clean_up)//Makes the other gens clean up as well if(!FG.clean_up)//Makes the other gens clean up as well