pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SecretsOTheP/Server

Browse Source 
Conflicts:
	common/patches/RoF.cpp
This commit is contained in:
SecretsOTheP
2013-03-23 05:05:16 -04:00
parent abaad22eb4 8e604fd3db
commit b0b342a020
21 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+1 -1
View File
@@ -5916,7 +5916,7 @@ void Client::CheckEmoteHail(Mob *target, const char* message)
{
return;
}
uint16 emoteid = target->CastToNPC()->GetNPCEmoteID();
uint16 emoteid = target->GetEmoteID();
if(emoteid != 0)
target->CastToNPC()->DoNPCEmote(HAILED,emoteid);
}