pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-29 16:58:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug] UINT32 EmoteID (#2369)

Browse Source 
emoteid packet structure is UINT32 but a number of references are in UINT16.
This commit is contained in:
Michael
2022-08-13 19:41:14 -04:00
committed by GitHub
parent 79285b1002
commit f6889d20e9
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob_ai.cpp
+2 -2
View File
@@ -1923,7 +1923,7 @@ void Mob::AI_Event_Engaged(Mob *attacker, bool yell_for_help)
if (attacker->GetHP() > 0) {
if (!CastToNPC()->GetCombatEvent() && GetHP() > 0) {
parse->EventNPC(EVENT_COMBAT, CastToNPC(), attacker, "1", 0);
uint16 emoteid = GetEmoteID();
uint32 emoteid = GetEmoteID();
if (emoteid != 0) {
CastToNPC()->DoNPCEmote(ENTERCOMBAT, emoteid);
}
@@ -1955,7 +1955,7 @@ void Mob::AI_Event_NoLongerEngaged() {
SetAssistAggro(false);
if (CastToNPC()->GetCombatEvent() && GetHP() > 0) {
if (entity_list.GetNPCByID(this->GetID())) {
uint16 emoteid = CastToNPC()->GetEmoteID();
uint32 emoteid = CastToNPC()->GetEmoteID();
parse->EventNPC(EVENT_COMBAT, CastToNPC(), nullptr, "0", 0);
if (emoteid != 0) {
CastToNPC()->DoNPCEmote(LEAVECOMBAT, emoteid);