[c13047] Allow creatures to handle several EVENT_T_RECEIVE_EMOTE inst…

…ead of one Some NPCs can react to several emotes from player not only one. Thanks @cyberium on nailing this. (based on commit [12836] - 5b24123) Signed-off-by: Xfurry <xfurry@scriptdev2.com>
cmangos · Feb 27, 2015 · fc152ad · fc152ad
1 parent 9eb376d
commit fc152ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
@@ -1457,7 +1457,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))

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "13046"
+ #define REVISION_NR "13047"
 #endif // __REVISION_NR_H__