Index: common/Player.cpp
===================================================================
--- common/Player.cpp	(revision eb2ad4f8d147f3e19dbe991e6f96f7c0561d5ba8)
+++ common/Player.cpp	(revision 6054f1ecc6fc81bf5a465d773718988bd49629e6)
@@ -206,4 +206,15 @@
 }
 
+void Player::takeDamage(int damage) {
+   this->health -= damage;
+   if (this->health < 0)
+      this->health = 0;
+   if (this->health == 0) {
+      cout << "Player died" << endl;
+      this->isDead = true;
+      this->timeDied = getCurrentMillis();
+   }
+}
+
 bool Player::updateTarget(map<unsigned int, Player*>& mapPlayers) {
    if (this->isChasing) {
Index: common/Player.h
===================================================================
--- common/Player.h	(revision eb2ad4f8d147f3e19dbe991e6f96f7c0561d5ba8)
+++ common/Player.h	(revision 6054f1ecc6fc81bf5a465d773718988bd49629e6)
@@ -50,4 +50,5 @@
    bool updateTarget(map<unsigned int, Player*>& mapPlayers);
    bool move(WorldMap *map);
+   void takeDamage(int damage);
 
    void takeFlag(int flag, WorldMap* map);
Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision eb2ad4f8d147f3e19dbe991e6f96f7c0561d5ba8)
+++ server/server.cpp	(revision 6054f1ecc6fc81bf5a465d773718988bd49629e6)
@@ -53,5 +53,4 @@
 Player *findPlayerByName(map<unsigned int, Player*> &m, string name);
 Player *findPlayerByAddr(map<unsigned int, Player*> &m, const sockaddr_in &addr);
-void damagePlayer(Player *p, int damage);
 
 void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map<unsigned int, Player*>& mapPlayers, MessageProcessor &msgProcessor);
@@ -222,5 +221,5 @@
 
                   Player* target = game->getPlayers()[itProj->second.target];
-                  damagePlayer(target, itProj->second.damage);
+                  target->takeDamage(itProj->second.damage);
 
                   if (target->isDead)
@@ -1029,5 +1028,5 @@
 
          Player* target = playersInGame[p->targetPlayer];
-         damagePlayer(target, p->damage);
+         target->takeDamage(p->damage);
 
          if (target->isDead)
@@ -1113,15 +1112,4 @@
 }
 
-void damagePlayer(Player *p, int damage) {
-   p->health -= damage;
-   if (p->health < 0)
-      p->health = 0;
-   if (p->health == 0) {
-      cout << "Player died" << endl;
-      p->isDead = true;
-      p->timeDied = getCurrentMillis();
-   }
-}
-
 void addObjectToMap(WorldMap::ObjectType objectType, int x, int y, WorldMap* gameMap, map<unsigned int, Player*>& mapPlayers, MessageProcessor &msgProcessor) {
    NETWORK_MSG serverMsg;