pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-14 07:48:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two crash fixes reported on the forums are hopefully fixed.

Browse Source
This commit is contained in:
SecretsOTheP
2013-03-20 10:46:09 -04:00
parent 925ba2199e
commit 56825e9ed0
10 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/MobAI.cpp
+5 -2
View File
@@ -1721,7 +1721,7 @@ void Mob::AI_Event_Engaged(Mob* attacker, bool iYellForHelp) {
if(!CastToNPC()->GetCombatEvent() && GetHP() > 0)
{
parse->EventNPC(EVENT_COMBAT, CastToNPC(), attacker, "1", 0);
uint16 emoteid = CastToNPC()->GetNPCEmoteID();
uint16 emoteid = GetEmoteID();
if(emoteid != 0)
CastToNPC()->DoNPCEmote(ENTERCOMBAT,emoteid);
CastToNPC()->SetCombatEvent(true);
@@ -1754,11 +1754,14 @@ void Mob::AI_Event_NoLongerEngaged() {
{
if(CastToNPC()->GetCombatEvent() && GetHP() > 0)
{
uint16 emoteid = CastToNPC()->GetNPCEmoteID();
if(entity_list.GetNPCByID(this->GetID()))
{
uint16 emoteid = CastToNPC()->GetEmoteID();
parse->EventNPC(EVENT_COMBAT, CastToNPC(), NULL, "0", 0);
if(emoteid != 0)
CastToNPC()->DoNPCEmote(LEAVECOMBAT,emoteid);
CastToNPC()->SetCombatEvent(false);
}
}
}
}