From 306ecf003a4c1c62f80bc0b6010ead03c20055a7 Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Mon, 13 Jun 2016 09:06:44 -0400 Subject: [PATCH] Spells like listless power and dread touch should be taking down/blocking spells like augmentation and strenthen respectively. The stacking code was being bypassed when a beneficial spell and a detrimental spell for the same effect were being compared. With this code removed, the spells are compared and the stonger of the two spells wins and replaces or blocks the other. Without this change, for example, dread touch takes down strengthen on the client, but the server still things strength is up, causing a mismatch. With this change, client/server match. --- zone/spells.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index a8fe41087..cb0d0f4d8 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -2983,18 +2983,6 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2, return (-1); } - /* - If the effects are the same and - sp1 = beneficial & sp2 = detrimental or - sp1 = detrimental & sp2 = beneficial - Then this effect should be ignored for stacking purposes. - */ - if(sp_det_mismatch) - { - Log.Out(Logs::Detail, Logs::Spells, "The effects are the same but the spell types are not, passing the effect"); - continue; - } - /* If the spells aren't the same and the effect is a dot we can go ahead and stack it