diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 753fc9d48..a319899c9 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -162,7 +162,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid) // Feed data to the struct ArenaTeamMember newMember; - //newMember.Name = playerName; + newMember.Name = playerName; newMember.Guid = playerGuid; newMember.Class = playerClass; newMember.SeasonGames = 0; @@ -249,7 +249,7 @@ bool ArenaTeam::LoadMembersFromDB(QueryResult result) newMember.WeekWins = fields[3].Get(); newMember.SeasonGames = fields[4].Get(); newMember.SeasonWins = fields[5].Get(); - //newMember.Name = fields[6].Get(); + newMember.Name = fields[6].Get(); newMember.Class = fields[7].Get(); newMember.PersonalRating = fields[8].Get(); newMember.MatchMakerRating = fields[9].Get() > 0 ? fields[9].Get() : sWorld->getIntConfig(CONFIG_ARENA_START_MATCHMAKER_RATING); diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index 69fa60e56..fe65d8398 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -51,7 +51,7 @@ public: { "rename", HandleArenaRenameCommand, SEC_ADMINISTRATOR, Console::Yes }, { "captain", HandleArenaCaptainCommand, SEC_ADMINISTRATOR, Console::No }, { "info", HandleArenaInfoCommand, SEC_GAMEMASTER, Console::Yes }, - { "lookup", HandleArenaLookupCommand, SEC_GAMEMASTER, Console::No }, + { "lookup", HandleArenaLookupCommand, SEC_GAMEMASTER, Console::Yes }, { "season", arenaSeasonCommandTable } }; @@ -209,7 +209,7 @@ public: handler->PSendSysMessage(LANG_ARENA_INFO_HEADER, arena->GetName(), arena->GetId(), arena->GetRating(), arena->GetType(), arena->GetType()); for (auto const& itr : arena->GetMembers()) - handler->PSendSysMessage(LANG_ARENA_INFO_MEMBERS, itr.Name, itr.Guid.ToString(), itr.PersonalRating, (arena->GetCaptain() == itr.Guid ? "- Captain" : "")); + handler->PSendSysMessage(LANG_ARENA_INFO_MEMBERS, itr.Name, itr.Guid.GetCounter(), itr.PersonalRating, (arena->GetCaptain() == itr.Guid ? "Captain" : "")); return true; } @@ -224,17 +224,17 @@ public: { if (StringContainsStringI(team->GetName(), needle)) { - if (handler->GetSession()) - { - handler->PSendSysMessage(LANG_ARENA_LOOKUP, team->GetName(), team->GetId(), team->GetType(), team->GetType()); - found = true; - continue; - } + handler->PSendSysMessage(LANG_ARENA_LOOKUP, team->GetName(), team->GetId(), team->GetType(), team->GetType()); + found = true; + continue; } } if (!found) - handler->PSendSysMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, std::string(needle)); + { + handler->SendErrorMessage(LANG_ARENA_ERROR_NAME_NOT_FOUND, std::string(needle)); + return false; + } return true; }