pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-05 04:13:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #531 from noudess/master

Browse Source 
Fix for detrimental/beneficial spell overwrite and/or block.
This commit is contained in:
Michael Cook (mackal) 2016-06-13 13:27:41 -04:00 committed by GitHub
commit af99db7287
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/spells.cpp
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