diff options
| author | megamage <none@none> | 2009-02-26 20:43:35 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-26 20:43:35 -0600 |
| commit | d3a69006675bb5317fab76584d5990b36c2fd5a5 (patch) | |
| tree | 8a0f3e0033eb694d5aba06db5c1ecc02b690099e /src/game/Spell.cpp | |
| parent | 39c513776c5dde8b5732df5ba2467d9e9e3e84fd (diff) | |
| parent | bc54e91afff9b9a53902439441fa2e63e3da1a9a (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9d9fdc70305..be224438257 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1106,7 +1106,10 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask) // assisting case, healing and resurrection if(unit->hasUnitState(UNIT_STAT_ATTACK_PLAYER)) + { m_caster->SetContestedPvP(); + //m_caster->UpdatePvP(true); + } if( unit->isInCombat() && !(m_spellInfo->AttributesEx & SPELL_ATTR_EX_NO_INITIAL_AGGRO) ) { m_caster->SetInCombatState(unit->GetCombatTimer() > 0); |