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

*Allow 2 mind flay auras to stack.

Browse Source 
*Rollback my last change about Conflagrate dmg calculation.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-06-28 10:14:19 +02:00
parent d87133961a
commit 3e895d2b66
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellEffects.cpp
+1 -1
View File
@@ -484,8 +484,8 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
(*i)->GetCasterGUID()==m_caster->GetGUID() ) (*i)->GetCasterGUID()==m_caster->GetGUID() )
{ {
uint32 pdamage = (*i)->GetAmount() > 0 ? (*i)->GetAmount() : 0; uint32 pdamage = (*i)->GetAmount() > 0 ? (*i)->GetAmount() : 0;
pdamage = m_caster->SpellDamageBonus(unitTarget, (*i)->GetSpellProto(), pdamage, DOT, (*i)->GetParentAura()->GetStackAmount());
damage += pdamage * 4; // 4 ticks of 3 seconds = 12 secs damage += pdamage * 4; // 4 ticks of 3 seconds = 12 secs
//damage = m_caster->SpellDamageBonus(unitTarget, (*i)->GetSpellProto(), damage, DOT, (*i)->GetParentAura()->GetStackAmount());
// Glyph of Conflagrate // Glyph of Conflagrate
if (!m_caster->HasAura(56235)) if (!m_caster->HasAura(56235))
unitTarget->RemoveAurasDueToSpell((*i)->GetId(), m_caster->GetGUID()); unitTarget->RemoveAurasDueToSpell((*i)->GetId(), m_caster->GetGUID());
src/game/SpellMgr.cpp
+1
View File
@@ -2839,6 +2839,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
case SPELL_AURA_POWER_BURN_MANA: case SPELL_AURA_POWER_BURN_MANA:
case SPELL_AURA_OBS_MOD_ENERGY: case SPELL_AURA_OBS_MOD_ENERGY:
case SPELL_AURA_OBS_MOD_HEALTH: case SPELL_AURA_OBS_MOD_HEALTH:
case SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE:
return false; return false;
default: default:
break; break;