Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2010-03-31 02:29:02 +04:00
commit f2572fdda0
33 changed files with 138 additions and 110 deletions

View file

@ -3857,7 +3857,7 @@ bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args)
return false;
}
target->SetUInt32Value(UNIT_NPC_EMOTESTATE,emote);
target->HandleEmote(emote);
return true;
}