nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-13 17:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core): Crashfix. (#13484)

Browse Source 
Fixes #13329
Fixes #13145
This commit is contained in:
UltraNix
2022-11-01 10:21:30 +01:00
committed by GitHub
parent 562178111d
commit 9e89917fd7
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/server/scripts/Spells/spell_mage.cpp
View File

@@ -789,12 +789,13 @@ class spell_mage_master_of_elements : public AuraScript
bool CheckProc(ProcEventInfo& eventInfo)
{
_spellInfo = eventInfo.GetSpellInfo();
if (!_spellInfo || !eventInfo.GetActor() || !eventInfo.GetActionTarget())
if (!eventInfo.GetActor() || !eventInfo.GetActionTarget())
{
return false;
}
_spellInfo = eventInfo.GetSpellInfo();
bool selectCaster = false;
// Triggered spells cost no mana so we need triggering spellInfo
if (SpellInfo const* triggeredByAuraSpellInfo = eventInfo.GetTriggerAuraSpell())
@@ -803,6 +804,13 @@ class spell_mage_master_of_elements : public AuraScript
selectCaster = true;
}
if (!_spellInfo)
{
return false;
}
_ticksModifier = 1;
// If spell is periodic, mana amount is divided by tick number
if (eventInfo.GetTriggerAuraEffectIndex() >= EFFECT_0)
{
@@ -812,24 +820,29 @@ class spell_mage_master_of_elements : public AuraScript
{
if (AuraEffect const* aurEff = target->GetAuraEffect(_spellInfo->Id, eventInfo.GetTriggerAuraEffectIndex(), caster->GetGUID()))
{
ticksModifier = aurEff->GetTotalTicks();
_ticksModifier = std::max(1, aurEff->GetTotalTicks());
}
}
}
}
return _spellInfo; // eventInfo.GetSpellInfo()
return true;
}
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
int32 mana = int32(_spellInfo->CalcPowerCost(GetTarget(), eventInfo.GetSchoolMask()) / ticksModifier);
mana = CalculatePct(mana, aurEff->GetAmount());
if (Unit* target = GetTarget())
{
int32 mana = int32(_spellInfo->CalcPowerCost(target, eventInfo.GetSchoolMask()) / _ticksModifier);
mana = CalculatePct(mana, aurEff->GetAmount());
if (mana > 0)
GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, nullptr, aurEff);
if (mana > 0)
{
target->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, target, true, nullptr, aurEff);
}
}
}
void Register() override
@@ -840,7 +853,7 @@ class spell_mage_master_of_elements : public AuraScript
private:
SpellInfo const* _spellInfo = nullptr;
uint8 ticksModifier = 1;
uint8 _ticksModifier = 0;
};
enum SilvermoonPolymorph