Merge remote-tracking branch 'origin/Networking' into ShootRays

2016-01-25 11:57:44 +01:00
parent b6fd18baed 06f64f8fbf
commit 8866dd6054
3 changed files with 4 additions and 0 deletions
@@ -406,6 +406,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;
 }