diff options
| -rw-r--r-- | src/server/game/Spells/SpellMgr.h | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 2afd2a4c70c..1d427103931 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -57,8 +57,8 @@ enum SpellFamilyFlag // Rogue SPELLFAMILYFLAG0_ROGUE_VANISH = 0x00000800, - SPELLFAMILYFLAG0_ROGUE_VAN_EVAS_SPRINT = 0x00000860, // Vanish, Evasion, Sprint - SPELLFAMILYFLAG1_ROGUE_COLDB_SHADOWSTEP = 0x00000240, // Cold Blood, Shadowstep + SPELLFAMILYFLAG0_ROGUE_VAN_SPRINT = 0x00000840, // Vanish, Sprint + SPELLFAMILYFLAG1_ROGUE_SHADOWSTEP = 0x00000200, // Shadowstep SPELLFAMILYFLAG0_ROGUE_KICK = 0x00000010, // Kick SPELLFAMILYFLAG1_ROGUE_DISMANTLE_SMOKE_BOMB = 0x80100000, // Dismantle, Smoke Bomb diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index d4e627b7cc1..ffbfdcbf896 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -366,21 +366,20 @@ class spell_rog_preparation : public SpellScriptLoader for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();) { SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itr->first); - if (!spellInfo) + if (!spellInfo || spellInfo->SpellFamilyName != SPELLFAMILY_ROGUE) continue; - if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && - (spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_ROGUE_COLDB_SHADOWSTEP || // Cold Blood, Shadowstep - spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG0_ROGUE_VAN_EVAS_SPRINT) || // Vanish, Evasion, Sprint + if ((spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_ROGUE_SHADOWSTEP || // Shadowstep + spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG0_ROGUE_VAN_SPRINT) || // Vanish, Sprint // Glyph of Preparation caster->HasAura(SPELL_ROGUE_GLYPH_OF_PREPARATION) && (spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_ROGUE_DISMANTLE_SMOKE_BOMB || // Dismantle, Smoke Bomb spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG0_ROGUE_KICK)) // Kick - { - caster->RemoveSpellCooldown((itr++)->first, true); - } - else - ++itr; + { + caster->RemoveSpellCooldown((itr++)->first, true); + } + else + ++itr; } } |