josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions 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
src/game/Unit.cpp
+2 -2
View File
@@ -9768,7 +9768,7 @@ void Unit::CombatStart(Unit* target)
target->SetInCombatWith(this); target->SetInCombatWith(this);
} }
if(Player* attackedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself()) if(Player* attackedPlayer = target->GetCharmerOrOwnerPlayerOrPlayerItself())
SetContestedPvP(attackedPlayer); SetContestedPvP(attackedPlayer);
} }
@@ -12363,7 +12363,7 @@ void Unit::SetContestedPvP(Player *attackedPlayer)
player->addUnitState(UNIT_STAT_ATTACK_PLAYER); player->addUnitState(UNIT_STAT_ATTACK_PLAYER);
player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP); player->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP);
// call MoveInLineOfSight for nearby contested guards // call MoveInLineOfSight for nearby contested guards
SetVisibility(GetVisibility()); player->SetVisibility(GetVisibility());
} }
if(!hasUnitState(UNIT_STAT_ATTACK_PLAYER)) if(!hasUnitState(UNIT_STAT_ATTACK_PLAYER))
{ {