diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-18 15:54:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-18 15:54:30 +0200 |
| commit | c238e8faffddad85e5324e102e9a77df0c87e942 (patch) | |
| tree | 8ae70a6f1377779c14347ccccc16daa09fac6dea /src/server/game/Handlers/ArenaTeamHandler.cpp | |
| parent | 1d1b3269c155c3aede43ffe25660e3d655cc3f99 (diff) | |
| parent | 0de1603944fe96253e02a1564881c80fe6519ebb (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Handlers/GroupHandler.cpp
Diffstat (limited to 'src/server/game/Handlers/ArenaTeamHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ArenaTeamHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index d9303d0295a..0f40650691f 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -147,7 +147,7 @@ void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) if (!normalizePlayerName(invitedName)) return; - player = sObjectAccessor->FindPlayerByName(invitedName); + player = ObjectAccessor::FindPlayerByName(invitedName); } if (!player) |