From 06f64f8fbfa791dfbf0b2ce361ff3dcc4fc5cc50 Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Sun, 24 Jan 2016 22:00:38 +0100
Subject: [PATCH] Added a player name to the PlayerSpawned event. When a player
 has spawned the server sends the name to the client which publishes the
 event.

---
 include/Engine/Core/EPlayerSpawned.h | 1 +
 src/Engine/Network/Client.cpp        | 1 +
 src/Engine/Network/Server.cpp        | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/include/Engine/Core/EPlayerSpawned.h b/include/Engine/Core/EPlayerSpawned.h
index a5700ed3..fcfaef61 100644
--- a/include/Engine/Core/EPlayerSpawned.h
+++ b/include/Engine/Core/EPlayerSpawned.h
@@ -12,6 +12,7 @@ struct PlayerSpawned : Event
     int PlayerID;
     EntityWrapper Player;
     EntityWrapper Spawner;
+    std::string PlayerName;
 };
 
 }
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 4ebf551d..05e9da61 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -147,6 +147,7 @@ void Client::parsePlayersSpawned(Packet& packet)
     e.Player = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
     e.Spawner = EntityWrapper(m_World, m_ServerIDToClientID[packet.ReadPrimitive<EntityID>()]);
     e.PlayerID = -1;
+    e.PlayerName = packet.ReadString();
     m_EventBroker->Publish(e);
 }
 
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index a29f4f02..30676d80 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -405,6 +405,8 @@ bool Server::OnPlayerSpawned(const Events::PlayerSpawned & e)
     Packet packet = Packet(MessageType::OnPlayerSpawned);
     packet.WritePrimitive<EntityID>(e.Player.ID);
     packet.WritePrimitive<EntityID>(e.Spawner.ID);
+    // We don't send PlayerID here because it will always be set to -1
+    packet.WriteString(m_ConnectedPlayers[e.PlayerID].Name);
     send(e.PlayerID, packet);
     return false;
 }