Relations Stage 2 Rollout: Migrate from IsFriendlyTo in GO visibility

Planned deprecation.
cmangos · Nov 8, 2017 · e4e63d3 · e4e63d3
1 parent 56c4185
commit e4e63d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/game/Entities/GameObject.cpp b/src/game/Entities/GameObject.cpp
@@ -853,19 +853,19 @@ bool GameObject::isVisibleForInState(Player const* u, WorldObject const* viewPoi
                     Player* ownerPlayer = (Player*)owner;
                     if ((GetMap()->IsBattleGroundOrArena() && ownerPlayer->GetBGTeam() != u->GetBGTeam()) ||
                         (ownerPlayer->IsInDuelWith(u)) ||
-                        (ownerPlayer->GetTeam() != u->GetTeam()))
+                        (!ownerPlayer->CanCooperate(u)))
                         trapNotVisible = true;
                 }
                 else
                 {
-                    if (u->IsFriendlyTo(owner))
+                    if (owner->CanCooperate(u))
                         return true;
                 }
             }
             // handle environment traps (spawned by DB)
             else
             {
-                if (this->IsFriendlyTo(u))
+                if (this->IsFriend(u))
                     return true;
                 else
                     trapNotVisible = true;