josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some reactive/shapeshift based talents being active in spec they are not learned in

Browse Source 
--HG--
branch : trunk
This commit is contained in:
thenecromancer
2010-01-24 15:05:07 +01:00
parent efa55f457f
commit 6c24f75524
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuraEffects.cpp
+2 -2
View File
@@ -2340,7 +2340,7 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
const PlayerSpellMap& sp_list = ((Player *)target)->GetSpellMap(); const PlayerSpellMap& sp_list = ((Player *)target)->GetSpellMap();
for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr) for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
{ {
if(itr->second->state == PLAYERSPELL_REMOVED) continue; if(itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) continue;
if(itr->first==spellId || itr->first==spellId2) continue; if(itr->first==spellId || itr->first==spellId2) continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
if (!spellInfo || !(spellInfo->Attributes & (SPELL_ATTR_PASSIVE | (1<<7)))) continue; if (!spellInfo || !(spellInfo->Attributes & (SPELL_ATTR_PASSIVE | (1<<7)))) continue;
@@ -2822,7 +2822,7 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const * aurApp, uint8 m
PlayerSpellMap const& sp_list = ((Player *)target)->GetSpellMap(); PlayerSpellMap const& sp_list = ((Player *)target)->GetSpellMap();
for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr) for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
{ {
if(itr->second->state == PLAYERSPELL_REMOVED) continue; if(itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
if (spellInfo && spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && spellInfo->SpellIconID == 139) if (spellInfo && spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && spellInfo->SpellIconID == 139)
Rage_val += target->CalculateSpellDamage(spellInfo,0,spellInfo->EffectBasePoints[0],target) * 10; Rage_val += target->CalculateSpellDamage(spellInfo,0,spellInfo->EffectBasePoints[0],target) * 10;
src/game/Unit.cpp
+1 -1
View File
@@ -9046,7 +9046,7 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
PlayerSpellMap const& sp_list = ((Player*)this)->GetSpellMap(); PlayerSpellMap const& sp_list = ((Player*)this)->GetSpellMap();
for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr) for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
{ {
if (itr->second->state == PLAYERSPELL_REMOVED) continue; if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->disabled) continue;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first); SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
if (!spellInfo || !IsPassiveSpell(itr->first)) continue; if (!spellInfo || !IsPassiveSpell(itr->first)) continue;
if (spellInfo->CasterAuraState == flag) if (spellInfo->CasterAuraState == flag)