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

Prevent crash in spell casting when group doesn't exist

Browse Source
This commit is contained in:
Russell Kinasz 2016-08-11 11:04:03 -07:00
parent e90e141a79
commit c1c9ec2790
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/spells.cpp
View File

@ -1729,7 +1729,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
{ {
if(IsGrouped()) if(IsGrouped())
{ {
group_id_caster = GetGroup()->GetID(); if (Group* group = GetGroup()) {
group_id_caster = group->GetID();
}
} }
else if(IsRaidGrouped()) else if(IsRaidGrouped())
{ {
@ -1744,7 +1746,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
Mob *owner = GetOwner(); Mob *owner = GetOwner();
if(owner->IsGrouped()) if(owner->IsGrouped())
{ {
group_id_caster = owner->GetGroup()->GetID(); if (Group* group = owner->GetGroup()) {
group_id_caster = group->GetID();
}
} }
else if(owner->IsRaidGrouped()) else if(owner->IsRaidGrouped())
{ {
@ -1773,7 +1777,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
{ {
if(spell_target->IsGrouped()) if(spell_target->IsGrouped())
{ {
group_id_target = spell_target->GetGroup()->GetID(); if (Group* group = spell_target->GetGroup()) {
group_id_target = group->GetID();
}
} }
else if(spell_target->IsRaidGrouped()) else if(spell_target->IsRaidGrouped())
{ {
@ -1788,7 +1794,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
Mob *owner = spell_target->GetOwner(); Mob *owner = spell_target->GetOwner();
if(owner->IsGrouped()) if(owner->IsGrouped())
{ {
group_id_target = owner->GetGroup()->GetID(); if (Group* group = owner->GetGroup()) {
group_id_target = group->GetID();
}
} }
else if(owner->IsRaidGrouped()) else if(owner->IsRaidGrouped())
{ {