aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index d6a2c64013a..6dc5e6201a5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -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))
{