Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 29fdf127f178088c530811257daa4eeef68a3a38)
+++ server/server.cpp	(revision 3ff2bd7ef8b47dfbc5af4481f3f44b76965c8f8f)
@@ -607,5 +607,5 @@
          break;
       }
-      case MSG_TYPE_START_ATTACK:
+      case MSG_TYPE_ATTACK:
       {
          cout << "Received a START_ATTACK message" << endl;
@@ -624,5 +624,5 @@
          map<unsigned int, Player*> players = p->currentGame->getPlayers();
 
-         serverMsg.type = MSG_TYPE_START_ATTACK;
+         serverMsg.type = MSG_TYPE_ATTACK;
          memcpy(serverMsg.buffer, &id, 4);
          memcpy(serverMsg.buffer+4, &targetId, 4);
@@ -1057,9 +1057,4 @@
       cout << "about to broadcast attack" << endl;
 
-      serverMsg.type = MSG_TYPE_ATTACK; 
-      memcpy(serverMsg.buffer, &p->id, 4);
-      memcpy(serverMsg.buffer+4, &p->targetPlayer, 4);
-      broadcastMessage(msgProcessor, serverMsg, playersInGame);
-
       if (p->attackType == Player::ATTACK_MELEE)
       {