aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKillyana <morphone1@gmail.com>2019-04-04 15:36:29 +0200
committerKillyana <morphone1@gmail.com>2019-04-04 15:36:29 +0200
commitc52eb49f71606b6b07b9edf279606713292ec92c (patch)
treea8d5279d4a3a47f2f982b9d9e317bc01d977dd7b /src
parentcc3293c0023b36434747190103a1f0ffee0f8488 (diff)
Core: Remove wrong emotes played in combat
Ref #23152
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 7cf57adaca7..b91a4af8f2a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -1364,12 +1364,6 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
if (!canTakeMeleeDamage())
return;
- // Hmmmm dont like this emotes client must by self do all animations
- if (damageInfo->HitInfo & HITINFO_CRITICALHIT)
- victim->HandleEmoteCommand(EMOTE_ONESHOT_WOUND_CRITICAL);
- if (damageInfo->Blocked && damageInfo->TargetState != VICTIMSTATE_BLOCKS)
- victim->HandleEmoteCommand(EMOTE_ONESHOT_PARRY_SHIELD);
-
if (damageInfo->TargetState == VICTIMSTATE_PARRY &&
(GetTypeId() != TYPEID_UNIT || (ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY_HASTEN) == 0))
{