server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core] Allow creatures to handle several EVENT_T_RECEIVE_EMOTE instead of one. (c2633)

Browse Source 
Some NPCs can react to several emotes from player not only one.
Thanks @cyberium on nailing this.
This commit is contained in:
cala 2015-03-26 11:31:38 +00:00 committed by Antz
parent f119a6119b
commit 4a8a482151
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Object/CreatureEventAI.cpp
View File

@ -1504,7 +1504,7 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
if (itr->Event.event_type == EVENT_T_RECEIVE_EMOTE) if (itr->Event.event_type == EVENT_T_RECEIVE_EMOTE)
{ {
if (itr->Event.receive_emote.emoteId != text_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); 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)) if (pcon.Meets(pPlayer, m_creature->GetMap(), m_creature, CONDITION_FROM_EVENTAI))