nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-16 05:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Scripts): missing null checks for GetCharmerOrOwner and GetOwner (#24902)

Browse Source
This commit is contained in:
Francesco Borzì
2026-03-03 01:57:25 +01:00
committed by GitHub
parent 779764383b
commit 0726ac1602
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -2559,7 +2559,7 @@ class spell_gen_vehicle_scaling_aura: public AuraScript
bool Load() override
{
return GetCaster() && GetCaster()->IsPlayer() && GetOwner()->IsCreature();
return GetCaster() && GetCaster()->IsPlayer() && GetOwner() && GetOwner()->IsCreature();
}
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)

3
src/server/scripts/World/npcs_special.cpp
View File

@@ -2674,7 +2674,8 @@ struct npc_controller : public PossessedAI
{
if (!apply)
{
me->GetCharmerOrOwner()->InterruptNonMeleeSpells(false);
if (Unit* charmerOrOwner = me->GetCharmerOrOwner())
charmerOrOwner->InterruptNonMeleeSpells(false);
}
}
};