ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Spells): add several missing null checks for the DamageInfo struct to fix a crash - Part II. (#8376)

Browse source
This commit is contained in:
UltraNix 2021-10-10 15:56:42 +02:00 • committed by GitHub
parent 760e043116
commit 66809383d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/scripts/Spells/spell_generic.cpp
View file

@ -773,7 +773,7 @@ public:
bool CheckProc(ProcEventInfo& eventInfo)
{
SpellInfo const* spellInfo = eventInfo.GetDamageInfo()->GetSpellInfo();
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo)
return false;
@ -927,7 +927,7 @@ public:
bool CheckProc(ProcEventInfo& eventInfo)
{
return !eventInfo.GetDamageInfo()->GetSpellInfo() || !eventInfo.GetDamageInfo()->GetSpellInfo()->IsTargetingArea();
return !eventInfo.GetSpellInfo() || !eventInfo.GetSpellInfo()->IsTargetingArea();
}
void Register() override
@ -1694,7 +1694,7 @@ public:
bool CheckProc(ProcEventInfo& eventInfo)
{
if (eventInfo.GetDamageInfo()->GetSpellInfo()) // eventInfo.GetSpellInfo()
if (eventInfo.GetSpellInfo())
return false;
// find Mage Armor
@ -2145,7 +2145,7 @@ public:
bool CheckProc(ProcEventInfo& eventInfo)
{
if (eventInfo.GetDamageInfo()->GetSpellInfo()) // eventInfo.GetSpellInfo()
if (eventInfo.GetSpellInfo())
return false;
if (GetFirstSchoolInMask(eventInfo.GetSchoolMask()) == SPELL_SCHOOL_NORMAL)