From 3bb2dc3588f9dbaacd3f5deb7cd9782f47383b84 Mon Sep 17 00:00:00 2001
From: Shocker <none@none>
Date: Wed, 8 Sep 2010 07:57:14 +0300
Subject: Core/Arena: Don't ignore GM visibility in arena pre-start visibility
 check, fixes issue 3862

--HG--
branch : trunk
---
 src/server/game/Entities/Player/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 6146224b7b9..a66c3a15c88 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20354,7 +20354,7 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
     // Arena visibility before arena start
     if (InArena() && GetBattleground()->GetStatus() == STATUS_WAIT_JOIN)
         if (const Player* target = u->GetCharmerOrOwnerPlayerOrPlayerItself())
-            return GetBGTeam() == target->GetBGTeam();
+            return GetBGTeam() == target->GetBGTeam() && target->isGMVisible();
 
     // phased visibility (both must phased in same way)
     if (!InSamePhase(u))
-- 
cgit v1.2.3