Merge remote-tracking branch 'origin/master' into TCPConnections

2016-02-03 10:29:36 +01:00
parent e133791369 24aac6a00d
commit 7bf4f5c30e
127 changed files with 3135 additions and 690 deletions
@@ -269,6 +269,7 @@ void Server::parseOnInputCommand(Packet& packet)
            Events::InputCommand e;
            e.Command = packet.ReadString();
            e.PlayerID = player; // Set correct player id
+            e.Player = EntityWrapper(m_World, m_ConnectedPlayers.at(player).EntityID);
            e.Value = packet.ReadPrimitive<float>();
            m_EventBroker->Publish(e);
            LOG_INFO("Server::parseOnInputCommand: Command is %s. Value is %f. PlayerID is %i.", e.Command.c_str(), e.Value, e.PlayerID);