diff options
| author | Kittnz <frederik156@hotmail.com> | 2016-02-06 22:03:24 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-02 19:40:30 +0200 |
| commit | b6b151fb1eb497f6ad43898085f32358a788e648 (patch) | |
| tree | 6078e86db855916a2a9e50ae1f13ed84a57389ec | |
| parent | b535d1e9f3a13fe99061135deb39bb04ff361e66 (diff) | |
Build fix
(cherry picked from commit add2179b75fb9944cf62b7dba8f120f5c8971ec7)
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 11 |
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 0618b404fbc..ce248872c3c 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2609,20 +2609,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; - } } } |