diff options
| author | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-06 16:32:59 -0500 |
|---|---|---|
| committer | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-06 16:32:59 -0500 |
| commit | f6d8b235e2fd52f2bc7f25fe56783c565cf7144a (patch) | |
| tree | 3e77f464ef7a29ab8841a96076b3f36ed81da08e /src/server/game/Chat/Chat.cpp | |
| parent | e7f035fdd3aafd33383a162a8c634f3837358ffa (diff) | |
| parent | f2ba8ed34b6799afe637709b85f6f3a3f7e9313e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index a5c059b30df..6d806336315 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -713,10 +713,11 @@ Player* ChatHandler::getSelectedPlayer() if (!m_session) return NULL; - if (Player* selected = m_session->GetPlayer()->GetSelectedPlayer()) - return selected; + uint64 selected = m_session->GetPlayer()->GetTarget(); + if (!selected) + return m_session->GetPlayer(); - return m_session->GetPlayer(); + return ObjectAccessor::FindPlayer(selected); } Unit* ChatHandler::getSelectedUnit() |