[6863] Arena team related clean ups and adding parts of w12x's arena patch.

This commit is contained in:
hunuza 2008-11-18 11:41:55 +01:00
parent 7ea5f922ea
commit e19433fa73
6 changed files with 143 additions and 93 deletions

View file

@ -5910,6 +5910,18 @@ void Player::UpdateHonorFields()
///An exact honor value can also be given (overriding the calcs)
bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor)
{
// do not reward honor in arenas, but enable onkill spellproc
if(InArena())
{
if(!uVictim || uVictim == this || uVictim->GetTypeId() != TYPEID_PLAYER)
return false;
if( GetBGTeam() == ((Player*)uVictim)->GetBGTeam() )
return false;
return true;
}
// 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
if(GetDummyAura(SPELL_AURA_PLAYER_INACTIVE))
return false;