Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision 1f6233ee7d55fd790b6369470627371d94bc998f)
+++ common/Player.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
@@ -217,8 +217,8 @@
 }
 
-bool Player::updateTarget(map<unsigned int, Player*>& mapPlayers) {
+bool Player::updateTarget(const Player* targetPlayer) {
    if (this->isChasing) {
-      this->target.x = mapPlayers[this->targetPlayer]->pos.x;
-      this->target.y = mapPlayers[this->targetPlayer]->pos.y;
+      this->target.x = targetPlayer->pos.x;
+      this->target.y = targetPlayer->pos.y;
 
       if (posDistance(this->pos, this->target.toFloat()) <= this->range) {
Index: common/Player.h
===================================================================
--- common/Player.h	(revision 1f6233ee7d55fd790b6369470627371d94bc998f)
+++ common/Player.h	(revision d998572d2b8fca258d9a75165638a41951561866)
@@ -48,5 +48,5 @@
    void deserialize(char* buffer);
 
-   bool updateTarget(map<unsigned int, Player*>& mapPlayers);
+   bool updateTarget(const Player* targetPlayer);
    bool move(WorldMap *map);
    void takeDamage(int damage);
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 1f6233ee7d55fd790b6369470627371d94bc998f)
+++ server/server.cpp	(revision d998572d2b8fca258d9a75165638a41951561866)
@@ -171,5 +171,5 @@
             if (p->currentGame != NULL) {
                map<unsigned int, Player*> playersInGame = p->currentGame->getPlayers();
-               if (p->updateTarget(playersInGame))
+               if (p->updateTarget(playersInGame[p->targetPlayer]))
                {
                   serverMsg.type = MSG_TYPE_PLAYER;