diff options
author | ariel- <ariel-@users.noreply.github.com> | 2016-10-14 02:14:19 -0300 |
---|---|---|
committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-09-06 13:36:06 +0200 |
commit | 6ea009581704b6f1676d49245b037156804e055f (patch) | |
tree | 04ae98ecc086d087126a29bb287a20bc29726007 | |
parent | 49648b66816b2ecedef65526c6a0f212be3d20b7 (diff) |
Core/Unit: disallow parry for totems
(cherry picked from commit b1777979c3e8801cd67c27e2cce55df791b38e93)
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3b9376afac5..4ba7c8501c9 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2613,13 +2613,16 @@ float Unit::GetUnitParryChance(WeaponAttackType attType, Unit const* victim) con chance = playerVictim->GetFloatValue(PLAYER_PARRY_PERCENTAGE); } } - else if (victim->GetTypeId() == TYPEID_UNIT && !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)) + else { - chance = 6.0f; - chance += victim->GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT); + if (!victim->IsTotem() && !(victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY)) + { + chance = 6.0f; + chance += victim->GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT); - if (levelDiff > 0) - levelBonus = 1.5f * levelDiff; + if (levelDiff > 0) + levelBonus = 1.5f * levelDiff; + } } chance += levelBonus; |