From 4a8a48215107d65682e2cfa00ad3b2cd7d6d1695 Mon Sep 17 00:00:00 2001 From: cala Date: Thu, 26 Mar 2015 11:31:38 +0000 Subject: [PATCH] [Core] Allow creatures to handle several EVENT_T_RECEIVE_EMOTE instead of one. (c2633) Some NPCs can react to several emotes from player not only one. Thanks @cyberium on nailing this. --- src/game/Object/CreatureEventAI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Object/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp index f42ca539..30f6f616 100644 --- a/src/game/Object/CreatureEventAI.cpp +++ b/src/game/Object/CreatureEventAI.cpp @@ -1504,7 +1504,7 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote) if (itr->Event.event_type == EVENT_T_RECEIVE_EMOTE) { if (itr->Event.receive_emote.emoteId != text_emote) - { return; } + { continue; } PlayerCondition pcon(0, itr->Event.receive_emote.condition, itr->Event.receive_emote.conditionValue1, itr->Event.receive_emote.conditionValue2); if (pcon.Meets(pPlayer, m_creature->GetMap(), m_creature, CONDITION_FROM_EVENTAI))