aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/World/npcs_special.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 0c1c55c5a64..8e9014df9fa 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -2668,20 +2668,17 @@ public:
void ReceiveEmote(Player* player, uint32 emote) override
{
- if (Unit* owner = me->GetCharmerOrOwner())
- {
- me->InterruptSpell(CURRENT_CHANNELED_SPELL);
- me->StopMoving();
+ me->InterruptSpell(CURRENT_CHANNELED_SPELL);
+ me->StopMoving();
- switch (emote)
- {
+ switch (emote)
+ {
case TEXT_EMOTE_BOW:
_events.ScheduleEvent(EVENT_FOCUS, 1000);
break;
case TEXT_EMOTE_DRINK:
_events.ScheduleEvent(EVENT_DRINK, 1000);
break;
- }
}
}