aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-04-14 19:07:11 -0300
committerfunjoker <funjoker109@gmail.com>2020-04-27 14:31:29 +0200
commit677df56d2da9eb5ae997537c9cc952ac86c8f8db (patch)
tree2b6cd50b61c18ac7bf15f3d19e9350f2a9f915f4
parent1edfd0d064a4417bc0a2ad38e23e9830f26cb0c5 (diff)
Core/Auras: don't skip stack rule check whenever spells have same ID
- The auras might not have the same amounts due to spellmods Closes #1626 (cherry picked from commit 9414f50f5c60b03871b4bd8d147786f77476ea04)
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 22f2e0cd530..b1d52d1906e 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -376,8 +376,6 @@ SpellGroupStackRule SpellMgr::CheckSpellGroupStackRules(SpellInfo const* spellIn
uint32 spellid_1 = spellInfo1->GetFirstRankSpell()->Id;
uint32 spellid_2 = spellInfo2->GetFirstRankSpell()->Id;
- if (spellid_1 == spellid_2)
- return SPELL_GROUP_STACK_RULE_DEFAULT;
// find SpellGroups which are common for both spells
SpellSpellGroupMapBounds spellGroup1 = GetSpellSpellGroupMapBounds(spellid_1);