diff options
| author | Gildor <gildor55@gmail.com> | 2019-09-07 12:57:02 +0200 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-09-07 12:57:02 +0200 |
| commit | f8d7b260476c69e09ab0329cb7cd6c277f5473a7 (patch) | |
| tree | 0f300a054d2da382e5d77a08e5d915612ec96429 | |
| parent | 8ecc45cd1aac1c33c8b4cb2f269ac24d728570cc (diff) | |
Core/Misc: Fix parry-haste mechanic. (#23773)
* Should check victim that do a parry instead of the unit that deal the damage (Wrong implementation of this commit: 4a46fee03ef204289bbd96e8e1e07117b3bebd9f )
Closes #23754
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 7fae69d54f0..afe4ebe8100 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1376,7 +1376,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss) return; if (damageInfo->TargetState == VICTIMSTATE_PARRY && - (GetTypeId() != TYPEID_UNIT || (ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY_HASTEN) == 0)) + (victim->GetTypeId() != TYPEID_UNIT || (victim->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY_HASTEN) == 0)) { // Get attack timers float offtime = float(victim->getAttackTimer(OFF_ATTACK)); |