aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Chat/Chat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
-rw-r--r--src/server/game/Chat/Chat.cpp7
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()