pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #506 from clucksoft/master

Browse Source 
Zone crash fix
This commit is contained in:
Michael Cook (mackal) 2016-03-07 02:03:25 -05:00
commit 2189569312
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/spells.cpp
View File

@ -1732,7 +1732,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
} }
else if(IsRaidGrouped()) else if(IsRaidGrouped())
{ {
group_id_caster = (GetRaid()->GetGroup(CastToClient()) == 0xFFFF) ? 0 : (GetRaid()->GetGroup(CastToClient()) + 1); if (Raid* raid = GetRaid()) {
uint32 group_id = raid->GetGroup(CastToClient());
group_id_caster = (group_id == 0xFFFFFFFF) ? 0 : (group_id + 1);
}
} }
} }
else if(IsPet()) else if(IsPet())
@ -1744,7 +1747,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
} }
else if(owner->IsRaidGrouped()) else if(owner->IsRaidGrouped())
{ {
group_id_caster = (owner->GetRaid()->GetGroup(CastToClient()) == 0xFFFF) ? 0 : (owner->GetRaid()->GetGroup(CastToClient()) + 1); if (Raid* raid = owner->GetRaid()) {
uint32 group_id = raid->GetGroup(owner->CastToClient());
group_id_caster = (group_id == 0xFFFFFFFF) ? 0 : (group_id + 1);
}
} }
} }
#ifdef BOTS #ifdef BOTS
@ -1770,7 +1776,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
} }
else if(spell_target->IsRaidGrouped()) else if(spell_target->IsRaidGrouped())
{ {
group_id_target = (spell_target->GetRaid()->GetGroup(CastToClient()) == 0xFFFF) ? 0 : (spell_target->GetRaid()->GetGroup(CastToClient()) + 1); if (Raid* raid = spell_target->GetRaid()) {
uint32 group_id = raid->GetGroup(spell_target->CastToClient());
group_id_target = (group_id == 0xFFFFFFFF) ? 0 : (group_id + 1);
}
} }
} }
else if(spell_target->IsPet()) else if(spell_target->IsPet())
@ -1782,7 +1791,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
} }
else if(owner->IsRaidGrouped()) else if(owner->IsRaidGrouped())
{ {
group_id_target = (owner->GetRaid()->GetGroup(CastToClient()) == 0xFFFF) ? 0 : (owner->GetRaid()->GetGroup(CastToClient()) + 1); if (Raid* raid = owner->GetRaid()) {
uint32 group_id = raid->GetGroup(owner->CastToClient());
group_id_target = (group_id == 0xFFFFFFFF) ? 0 : (group_id + 1);
}
} }
} }
#ifdef BOTS #ifdef BOTS