Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2009-12-22 05:13:25 +03:00
commit c83b72da90
9 changed files with 57 additions and 10 deletions

View file

@ -6756,6 +6756,11 @@ void Aura::PeriodicTick()
int32 gain = m_target->ModifyHealth(pdamage);
// Set trigger flag
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
uint32 procVictim = PROC_FLAG_ON_TAKE_PERIODIC;
pCaster->ProcDamageAndSpell(m_target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, gain, BASE_ATTACK, m_spellProto);
// add HoTs to amount healed in bgs
if( pCaster->GetTypeId() == TYPEID_PLAYER )
if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )