diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-04-14 19:07:11 -0300 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-04-14 19:07:11 -0300 |
| commit | 9414f50f5c60b03871b4bd8d147786f77476ea04 (patch) | |
| tree | 1e49de5cb9c8ab36e438d034b29e60294b43617a | |
| parent | 4a40b8ed4358e46df12adb927dc29afaaf801e45 (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
| -rw-r--r-- | sql/updates/world/3.3.5/2017_04_15_00_world_335.sql | 5 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/updates/world/3.3.5/2017_04_15_00_world_335.sql b/sql/updates/world/3.3.5/2017_04_15_00_world_335.sql new file mode 100644 index 00000000000..91a463da2e1 --- /dev/null +++ b/sql/updates/world/3.3.5/2017_04_15_00_world_335.sql @@ -0,0 +1,5 @@ +UPDATE `spell_group_stack_rules` SET `stack_rule`=3 WHERE `group_id`=1025; +DELETE FROM `spell_group_stack_rules` WHERE `group_id` IN (1023,1024); +INSERT INTO `spell_group_stack_rules` (`group_id`, `stack_rule`) VALUES +(1023, 4), +(1024, 4); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 9e78d8cb287..77f3f44f1e5 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -439,8 +439,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); |