From e63f663f3bc469d63d5dc4906566290487ca4aac Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 25 Aug 2019 00:26:08 +0200 Subject: [PATCH] Core/Spells: fixed a crash in Stampede aurascript and added missing proc data to it. --- sql/updates/world/custom/custom_2019_08_25_00_world.sql | 2 ++ src/server/scripts/Spells/spell_druid.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 sql/updates/world/custom/custom_2019_08_25_00_world.sql diff --git a/sql/updates/world/custom/custom_2019_08_25_00_world.sql b/sql/updates/world/custom/custom_2019_08_25_00_world.sql new file mode 100644 index 00000000000..7e98e280329 --- /dev/null +++ b/sql/updates/world/custom/custom_2019_08_25_00_world.sql @@ -0,0 +1,2 @@ +INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES +(-78892, 0, 7, 0, 0, 48, 4096, 1, 1, 0, 0, 0, 100, 0, 0); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 6274e3ea275..77c9131518e 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -890,7 +890,7 @@ class spell_dru_stampede : public AuraScript void HandleEffectCatProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - if (GetTarget()->GetShapeshiftForm() != FORM_CAT || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT) + if (GetTarget()->GetShapeshiftForm() != FORM_CAT || eventInfo.GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT) return; GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_CAT_RANK_1, GetSpellInfo()->GetRank()), true, nullptr, aurEff); @@ -900,7 +900,7 @@ class spell_dru_stampede : public AuraScript void HandleEffectBearProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); - if (GetTarget()->GetShapeshiftForm() != FORM_BEAR || eventInfo.GetDamageInfo()->GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR) + if (GetTarget()->GetShapeshiftForm() != FORM_BEAR || eventInfo.GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR) return; GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BAER_RANK_1, GetSpellInfo()->GetRank()), true, nullptr, aurEff);