Merge branch 'master' of github.com:EQEmu/Server into wp

This commit is contained in:
KimLS
2017-08-31 17:47:33 -07:00
22 changed files with 717 additions and 552 deletions
+2
View File
@@ -648,6 +648,8 @@ void EntityList::AddNPC(NPC *npc, bool SendSpawnPacket, bool dontqueue)
parse->EventNPC(EVENT_SPAWN, npc, nullptr, "", 0);
npc->FixZ();
uint16 emoteid = npc->GetEmoteID();
if (emoteid != 0)
npc->DoNPCEmote(ONSPAWN, emoteid);