sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Core/Spells]: Fixed stormstrike and lava lash consuing flurry. (#7397)

Browse Source 
* [Core/Spells]: Fixed stormstrike and lava lash consuing flurry.

* Update

Co-authored-by: Stefano Borzì <stefanoborzi32@gmail.com>
This commit is contained in:
lineagedr
2021-08-20 20:40:16 +03:00
committed by GitHub
parent 051fcf4534
commit 32e149e342
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/spell_shaman.cpp
+8 -3
View File
@@ -48,7 +48,9 @@ enum ShamanSpells
SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM = 6474, SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM = 6474,
SPELL_SHAMAN_TOTEM_EARTHEN_POWER = 59566, SPELL_SHAMAN_TOTEM_EARTHEN_POWER = 59566,
SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL = 52042, SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL = 52042,
SPELL_SHAMAN_BLESSING_OF_THE_ETERNALS_R1 = 51554 SPELL_SHAMAN_BLESSING_OF_THE_ETERNALS_R1 = 51554,
SPELL_SHAMAN_STORMSTRIKE = 17364,
SPELL_SHAMAN_LAVA_LASH = 60103
}; };
enum ShamanSpellIcons enum ShamanSpellIcons
@@ -1366,10 +1368,13 @@ public:
bool CheckProc(ProcEventInfo& eventInfo) bool CheckProc(ProcEventInfo& eventInfo)
{ {
// Should not proc from Windfury Attack // Should not proc from Windfury Attack, Stormstrike and Lava Lash
if (SpellInfo const* spellInfo = eventInfo.GetSpellInfo()) if (SpellInfo const* spellInfo = eventInfo.GetSpellInfo())
{ {
if (spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && (spellInfo->SpellFamilyFlags[0] & 0x00800000) != 0) constexpr std::array<uint32, 2> spellIcons = {SPELL_SHAMAN_STORMSTRIKE, SPELL_SHAMAN_LAVA_LASH};
const auto found = std::find(std::begin(spellIcons), std::end(spellIcons), spellInfo->Id);
if ((spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && (spellInfo->SpellFamilyFlags[0] & 0x00800000) != 0) || found != std::end(spellIcons))
{ {
return false; return false;
} }