From aca9efc47ac01ef803288dbb55207726a57f4bd6 Mon Sep 17 00:00:00 2001 From: Treeston Date: Fri, 19 Feb 2016 14:04:18 +0100 Subject: Merge pull request #16633 from Treeston/3.3.5-talentinspect Core/Packets: Adjust 'TalentsInspecting' option (cherry picked from commit 3e250fe4e80205e7b2d0203aa170bef579be5038) --- src/server/game/Handlers/InspectHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Handlers/InspectHandler.cpp') diff --git a/src/server/game/Handlers/InspectHandler.cpp b/src/server/game/Handlers/InspectHandler.cpp index 85b8f6adee7..3ffde3dc3e3 100644 --- a/src/server/game/Handlers/InspectHandler.cpp +++ b/src/server/game/Handlers/InspectHandler.cpp @@ -50,7 +50,7 @@ void WorldSession::HandleInspectOpcode(WorldPackets::Inspect::Inspect& inspect) inspectResult.ClassID = player->getClass(); inspectResult.GenderID = player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER); - if (sWorld->getBoolConfig(CONFIG_TALENTS_INSPECTING) || GetPlayer()->IsGameMaster()) + if (GetPlayer()->CanBeGameMaster() || sWorld->getIntConfig(CONFIG_TALENTS_INSPECTING) + (GetPlayer()->GetTeamId() == player->GetTeamId()) > 1) { PlayerTalentMap const* talents = player->GetTalentMap(player->GetActiveTalentGroup()); for (PlayerTalentMap::value_type const& v : *talents) -- cgit v1.2.3