From 8b48f9f902ac20a2106cba162f3c3685efe1a413 Mon Sep 17 00:00:00 2001
From: Emagi <image.emagi@gmail.com>
Date: Thu, 12 Jun 2025 09:49:04 -0400
Subject: [PATCH] Fix persist through death for things like food/drink spell
 effects

---
 source/WorldServer/SpellProcess.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/WorldServer/SpellProcess.cpp b/source/WorldServer/SpellProcess.cpp
index a608a32..c2fda22 100644
--- a/source/WorldServer/SpellProcess.cpp
+++ b/source/WorldServer/SpellProcess.cpp
@@ -2056,14 +2056,17 @@ void SpellProcess::RemoveSpellTimersFromSpawn(Spawn* spawn, bool remove_all, boo
 		MutexList<LuaSpell*>::iterator itr = active_spells.begin();
 		while(itr.Next()){
 			spell = itr->value;
-			if (!spell)
+			
+			if (!spell || !spell->spell || !spell->spell->GetSpellData())
 				continue;
+			
+			if (spell->spell->GetSpellData()->persist_through_death)
+				continue;
+			
 			if(spell->caster == spawn && call_expire_function){
 				DeleteCasterSpell(spell, "expired", remove_all, nullptr, false, lock_spell_process);
 				continue;
 			}
-			if (spell->spell->GetSpellData()->persist_through_death)
-				continue;
 
 			bool foundMatch = false;