From a006db9e63459f5a1ddbb83befa988e20944efca Mon Sep 17 00:00:00 2001
From: Jocke <joachimpetterson@gmail.com>
Date: Tue, 16 Feb 2016 16:06:17 +0100
Subject: [PATCH] WIP Fix dsync

---
 include/Game/Systems/PlayerMovementSystem.h |  2 +-
 src/Engine/Network/Client.cpp               |  2 +-
 src/Engine/Network/Server.cpp               |  4 ++--
 src/Game/Systems/PlayerMovementSystem.cpp   | 20 ++++++++++++--------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h
index 2bcae866..d9006504 100644
--- a/include/Game/Systems/PlayerMovementSystem.h
+++ b/include/Game/Systems/PlayerMovementSystem.h
@@ -39,5 +39,5 @@ private:
     bool OnPlayerSpawned(Events::PlayerSpawned& e);
 
     void updateMovementControllers(double dt);
-    void updateVelocity(double dt);
+    void updateVelocity(EntityWrapper player, double dt);
 };
\ No newline at end of file
diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp
index 62bc8e73..b25130f5 100644
--- a/src/Engine/Network/Client.cpp
+++ b/src/Engine/Network/Client.cpp
@@ -73,7 +73,7 @@ void Client::Update()
             m_TimeSinceSentInputs = std::clock();
         }
         // HACK: Send absolute player positions for now to avoid desync until we have reliable messages
-        sendLocalPlayerTransform();
+        //sendLocalPlayerTransform();
 
         hasServerTimedOut();
     }
diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp
index 082849c7..d602d9ab 100644
--- a/src/Engine/Network/Server.cpp
+++ b/src/Engine/Network/Server.cpp
@@ -119,7 +119,7 @@ void Server::parseMessageType(Packet& packet)
         parseOnPlayerDamage(packet);
         break;
     case MessageType::PlayerTransform:
-        parsePlayerTransform(packet);
+//       parsePlayerTransform(packet);
         break;
     default:
         break;
@@ -376,7 +376,7 @@ bool Server::OnInputCommand(const Events::InputCommand & e)
         isReadingData = !isReadingData;
         m_SaveDataTimer = std::clock();
     }
-    if (e.Command == "KickPlayer" && e.Value > 0) {
+    else if (e.Command == "KickPlayer" && e.Value > 0) {
         kick(0);
     }
 
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index 71fb16ee..a144dd18 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -16,7 +16,15 @@ PlayerMovementSystem::~PlayerMovementSystem()
 void PlayerMovementSystem::Update(double dt)
 {
     updateMovementControllers(dt);
-    updateVelocity(dt);
+    if (IsServer) {
+        for (auto& kv : m_PlayerInputControllers) {
+            updateVelocity(kv.first, dt);
+        }
+    } else {
+        if (LocalPlayer.Valid()) {
+            updateVelocity(LocalPlayer, dt);
+        }
+    }
 }
 
 void PlayerMovementSystem::updateMovementControllers(double dt)
@@ -221,15 +229,11 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
 }
 
 
-void PlayerMovementSystem::updateVelocity(double dt)
+void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
 {
     // Only apply velocity to local player
-    if (!LocalPlayer.Valid()) {
-        return;
-    }
-
-    ComponentWrapper& cTransform = LocalPlayer["Transform"];
-    ComponentWrapper& cPhysics = LocalPlayer["Physics"];
+    ComponentWrapper& cTransform = player["Transform"];
+    ComponentWrapper& cPhysics = player["Physics"];
     glm::vec3& velocity = cPhysics["Velocity"];
     bool isOnGround = (bool)cPhysics["IsOnGround"];