pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick fix for dot issue introduced in 765b5ee8

Browse Source 
This could probably be done better
This commit is contained in:
Michael Cook 2013-11-19 18:34:20 -05:00
parent e33eb9d7b0
commit 0567073ca0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/spells.cpp
View File

@ -2669,8 +2669,9 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
*/ */
if(IsNPC() && caster1 && caster2 && caster1 != caster2) { if(IsNPC() && caster1 && caster2 && caster1 != caster2) {
if(effect1 == SE_CurrentHP && sp1_detrimental && sp2_detrimental) { 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"); 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 and the effect is a dot we can go ahead and stack it
*/ */
if(effect1 == SE_CurrentHP && spellid1 != spellid2 && sp1_detrimental && sp2_detrimental) { 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"); mlog(SPELLS__STACKING, "The spells are not the same and it is a detrimental dot, passing");
continue; continue;
} }