From 0567073ca00a99a50436a91632c7a9be3ab7dc1b Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Tue, 19 Nov 2013 18:34:20 -0500 Subject: [PATCH] Quick fix for dot issue introduced in 765b5ee8 This could probably be done better --- zone/spells.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index 600c90538..161b702b5 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -2669,8 +2669,9 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, */ if(IsNPC() && caster1 && caster2 && caster1 != caster2) { if(effect1 == SE_CurrentHP && sp1_detrimental && sp2_detrimental) { - continue; + effect_match = false; // We want to skip this logic mlog(SPELLS__STACKING, "Both casters exist and are not the same, the effect is a detrimental dot, moving on"); + continue; } } @@ -2696,6 +2697,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, and the effect is a dot we can go ahead and stack it */ if(effect1 == SE_CurrentHP && spellid1 != spellid2 && sp1_detrimental && sp2_detrimental) { + effect_match = false; // We want to skip this logic mlog(SPELLS__STACKING, "The spells are not the same and it is a detrimental dot, passing"); continue; }