pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +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/attack.cpp
+4 -4
View File
@@ -1779,7 +1779,7 @@ bool Client::Death(Mob* killerMob, int64 damage, uint16 spell, EQ::skills::Skill
mod_client_death_npc(killerMob);
uint16 emoteid = killerMob->GetEmoteID();
uint32 emoteid = killerMob->GetEmoteID();
if (emoteid != 0)
killerMob->CastToNPC()->DoNPCEmote(KILLEDPC, emoteid);
killerMob->TrySpellOnKill(killed_level, spell);
@@ -2610,7 +2610,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
entity_list.RemoveFromAutoXTargets(this);
uint16 emoteid = GetEmoteID();
uint32 emoteid = GetEmoteID();
auto corpse = new Corpse(this, &itemlist, GetNPCTypeID(), &NPCTypedata,
level > 54 ? RuleI(NPC, MajorNPCCorpseDecayTimeMS)
: RuleI(NPC, MinorNPCCorpseDecayTimeMS));
@@ -2708,12 +2708,12 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
if (oos) {
mod_npc_killed(oos);
uint16 emoteid = GetEmoteID();
uint32 emoteid = GetEmoteID();
if (emoteid != 0)
DoNPCEmote(ONDEATH, emoteid);
if (oos->IsNPC()) {
parse->EventNPC(EVENT_NPC_SLAY, oos->CastToNPC(), this, "", 0);
uint16 emoteid = oos->GetEmoteID();
uint32 emoteid = oos->GetEmoteID();
if (emoteid != 0)
oos->CastToNPC()->DoNPCEmote(KILLEDNPC, emoteid);
killer_mob->TrySpellOnKill(killed_level, spell);