Merge pull request #12007 from Trisjdc/spell_pushback

Core/Spells: Define and implement SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE
This commit is contained in:
jackpoz
2014-05-29 19:54:39 +02:00
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -774,7 +774,8 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam
if (damagetype != NODAMAGE && damage)
{
if (victim != this && victim->GetTypeId() == TYPEID_PLAYER) // does not support creature push_back
if (victim != this && victim->GetTypeId() == TYPEID_PLAYER && // does not support creature push_back
(!spellProto || !(spellProto->AttributesEx7 & SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE)))
{
if (damagetype != DOT)
if (Spell* spell = victim->m_currentSpells[CURRENT_GENERIC_SPELL])