From 0c3149a6e5019b7b7d15e03b9bd0c142ef28c8f5 Mon Sep 17 00:00:00 2001 From: Fryguy Date: Sun, 7 Jan 2024 12:13:36 -0500 Subject: [PATCH] [Bug Fix] Rez Effects Stacking (#3882) Nothing conflicts with stacking with resurrection effects --- zone/spells.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zone/spells.cpp b/zone/spells.cpp index 0ea0c5108..78810be46 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -3055,6 +3055,10 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, LogSpells("Check Stacking on old [{}] ([{}]) @ lvl [{}] (by [{}]) vs. new [{}] ([{}]) @ lvl [{}] (by [{}])", sp1.name, spellid1, caster_level1, (caster1==nullptr)?"Nobody":caster1->GetName(), sp2.name, spellid2, caster_level2, (caster2==nullptr)?"Nobody":caster2->GetName()); + if (IsResurrectionEffects(spellid1)) { + return 0; + } + if (spellbonuses.CompleteHealBuffBlocker && IsEffectInSpell(spellid2, SE_CompleteHeal)) { Message(0, "You must wait before you can be affected by this spell again."); return -1;