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

Merge pull request #4757 from Subv/shocking

Browse Source 
Core/Achievements: Fix Shocking! on 10-man and 25-man
This commit is contained in:
Shocker
2012-01-10 15:06:25 -08:00
parent 528a9a6966 f7276a95de
commit 41488c9deb
4 changed files with 81 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/SpellEffects.cpp
-32
View File
@@ -333,38 +333,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex)
switch (m_spellInfo->Id) // better way to check unknown
{
// Positive/Negative Charge
case 28062:
case 28085:
case 39090:
case 39093:
if (!m_triggeredByAuraSpell)
break;
if (unitTarget == m_caster)
{
uint8 count = 0;
for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
if (ihit->targetGUID != m_caster->GetGUID())
if (Player* target = ObjectAccessor::GetPlayer(*m_caster, ihit->targetGUID))
if (target->HasAura(m_triggeredByAuraSpell->Id))
++count;
if (count)
{
uint32 spellId = 0;
switch (m_spellInfo->Id)
{
case 28062: spellId = 29659; break;
case 28085: spellId = 29660; break;
case 39090: spellId = 39089; break;
case 39093: spellId = 39092; break;
}
m_caster->SetAuraStack(spellId, m_caster, count);
}
}
if (unitTarget->HasAura(m_triggeredByAuraSpell->Id))
damage = 0;
break;
// Consumption
case 28865:
damage = (((InstanceMap*)m_caster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY ? 2750 : 4250);