Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Globals/ObjectMgr.cpp
This commit is contained in:
commit
b87f794e16
3 files changed
+18
-4
No files matched your search
@@ -22642,10 +22642,10 @@ bool Player::IsAlwaysDetectableFor(WorldObject const* seer) const
|
||||
|
||||
if (const Player* seerPlayer = seer->ToPlayer())
|
||||
if (IsGroupVisibleFor(seerPlayer))
|
||||
return true;
|
||||
return !(seerPlayer->duel && seerPlayer->duel->startTime != 0 && seerPlayer->duel->opponent == this);
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Player::IsVisibleGloballyFor(Player const* u) const
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user