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.
This commit is contained in:
Paul Coene 2016-06-13 09:06:44 -04:00
parent 83bb10b32b
commit 306ecf003a

View File

@ -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