diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index 8be3bae544a..82efa91ff7d 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -198,7 +198,7 @@ /// Check if we're still being held. Otherwise... time to qdel. /obj/item/spell/proc/check_owner() - if(!(loc == owner) && !(cast_methods & CAST_THROW)) + if(!QDELETED(src) && !(loc == owner) && !(cast_methods & CAST_THROW)) qdel_self() // Proc: unref_spells() @@ -370,7 +370,8 @@ // Description: Deletes the spell object immediately. /obj/item/spell/dropped() . = ..() - qdel_self() + if(!QDELETED(src)) + qdel_self() // Proc: throw_impact() diff --git a/html/changelogs/fluffyghost-fixspelldelloop.yml b/html/changelogs/fluffyghost-fixspelldelloop.yml new file mode 100644 index 00000000000..260be6e7678 --- /dev/null +++ b/html/changelogs/fluffyghost-fixspelldelloop.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: "Fixed (some of the reasons of) spell objects looping on destroy."