diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-05-29 19:54:39 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-05-29 19:54:39 +0200 |
| commit | b92e1046bee4eda730159f129085826dfd337340 (patch) | |
| tree | b6fb1d88ccafb8383c633c78d6658608ddd5fb18 /src/server/game/Entities | |
| parent | fabceddacbff254bdded1044901bc1740d110aef (diff) | |
| parent | 719a00e926e6187e816440e97dfc0d8ede0812b8 (diff) | |
Merge pull request #12007 from Trisjdc/spell_pushback
Core/Spells: Define and implement SPELL_ATTR7_NO_PUSHBACK_ON_DAMAGE
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index abc16256b73..5ef81509415 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -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]) |