Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Try to fix the bug about contested pvp.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2008-12-02 16:34:00 -06:00
parent 724b627f49
commit 1fd4c1dee2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Unit.cpp
View File

@@ -9768,7 +9768,7 @@ void Unit::CombatStart(Unit* target)
target->SetInCombatWith(this);
}
if(Player* attackedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself())
if(Player* attackedPlayer = target->GetCharmerOrOwnerPlayerOrPlayerItself())
SetContestedPvP(attackedPlayer);
}
@@ -12363,7 +12363,7 @@ void Unit::SetContestedPvP(Player *attackedPlayer)
player->addUnitState(UNIT_STAT_ATTACK_PLAYER);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP);
// call MoveInLineOfSight for nearby contested guards
SetVisibility(GetVisibility());
player->SetVisibility(GetVisibility());
}
if(!hasUnitState(UNIT_STAT_ATTACK_PLAYER))
{