Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed a crash in SpellInfo::GetEffect happening when the current difficulty did not have an overriding effect

Browse Source
This commit is contained in:
Shauren
2014-12-14 11:28:13 +01:00
parent 16ff14e758
commit edf5fc2236
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Spells/SpellInfo.cpp
View File

@@ -341,8 +341,6 @@ SpellImplicitTargetInfo::StaticData SpellImplicitTargetInfo::_data[TOTAL_SPELL_
SpellEffectInfo::SpellEffectInfo(SpellEntry const* /*spellEntry*/, SpellInfo const* spellInfo, uint8 effIndex, SpellEffectEntry const* _effect)
{
SpellScalingEntry const* scaling = spellInfo->GetSpellScaling();
_spellInfo = spellInfo;
EffectIndex = _effect ? _effect->EffectIndex : effIndex;
Effect = _effect ? _effect->Effect : 0;
@@ -870,21 +868,12 @@ SpellInfo::SpellInfo(SpellEntry const* spellEntry, SpellEffectEntryMap effects)
_effects[itr->first][effect->EffectIndex] = new SpellEffectInfo(spellEntry, this, effect->EffectIndex, effect);
}
/*_effects[itr->first].resize(MAX_SPELL_EFFECTS);
for (SpellEffectEntryVector::const_iterator i = itr->second.begin(); i != itr->second.end(); ++i)
{
if (!(*i))
continue;
_effects[itr->first][(*i)->EffectIndex] = new SpellEffectInfo(spellEntry, this, (*i)->EffectIndex, (*i));
}*/
}
SpellName = spellEntry->Name_lang;
//Rank = spellEntry->Rank;
Rank = nullptr;
RuneCostID = spellEntry->RuneCostID;
//SpellDifficultyId = spellEntry->DifficultyID;
SpellDifficultyId = 0;
SpellScalingId = spellEntry->ScalingID;
SpellAuraOptionsId = spellEntry->AuraOptionsID;
SpellAuraRestrictionsId = spellEntry->AuraRestrictionsID;
@@ -3097,8 +3086,9 @@ SpellEffectInfoVector SpellInfo::GetEffectsForDifficulty(uint32 difficulty) cons
{
for (SpellEffectInfo const* effect : itr->second)
{
// overwrite any existing effect from DIFFICULTY_NONE
effList[effect->EffectIndex] = effect;
// overwrite any existing effect from DIFFICULTY_NONE
if (effect)
effList[effect->EffectIndex] = effect;
}
// if we found any effect in our difficulty then stop searching
break;