From dfe96993929fb3f414f0dd944ba99d8d4f9c024e Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:56:45 +0200 Subject: [PATCH] Prevent reprocessing deleted lights (#17348) * Atomization * sfsfa --------- Co-authored-by: FluffyGhost --- code/controllers/subsystems/lighting.dm | 4 ++ ...st-prevent_reprocessing_deleted_lights.yml | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 html/changelogs/FluffyGhost-prevent_reprocessing_deleted_lights.yml diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm index 18450bd0a39..b6f6406f311 100644 --- a/code/controllers/subsystems/lighting.dm +++ b/code/controllers/subsystems/lighting.dm @@ -131,6 +131,8 @@ var/datum/controller/subsystem/lighting/SSlighting while (lq_idex <= curr_lights.len) var/datum/light_source/L = curr_lights[lq_idex++] + if(QDELETED(L)) + continue if (L.needs_update != LIGHTING_NO_UPDATE) total_ss_updates += 1 @@ -154,6 +156,8 @@ var/datum/controller/subsystem/lighting/SSlighting while (cq_idex <= curr_corners.len) var/datum/lighting_corner/C = curr_corners[cq_idex++] + if(QDELETED(C)) + continue if (C.needs_update) C.update_overlays() diff --git a/html/changelogs/FluffyGhost-prevent_reprocessing_deleted_lights.yml b/html/changelogs/FluffyGhost-prevent_reprocessing_deleted_lights.yml new file mode 100644 index 00000000000..1be94b2beac --- /dev/null +++ b/html/changelogs/FluffyGhost-prevent_reprocessing_deleted_lights.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Prevents SSlighting to process QDELETED lights and corners."