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

Merge branch 'master' into tasks

Browse Source
This commit is contained in:
Michael Cook (mackal) 2018-06-24 23:22:02 -04:00
commit 3d3eee9772
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/spdat.cpp
View File

@ -244,8 +244,7 @@ bool IsBeneficialSpell(uint16 spell_id)
} else {
// If the resisttype is not magic and spell is Bind Sight or Cast Sight
// It's not beneficial
if (sai == SAI_Dispell_Sight && spells[spell_id].skill == 18 &&
!IsEffectInSpell(spell_id, SE_VoiceGraft))
if ((sai == SAI_Calm && IsEffectInSpell(spell_id, SE_Harmony)) || (sai == SAI_Calm_Song && IsEffectInSpell(spell_id, SE_BindSight)) || (sai == SAI_Dispell_Sight && spells[spell_id].skill == 18 && !IsEffectInSpell(spell_id, SE_VoiceGraft)))
return false;
}
}