better handling of focus and input

[blank.git] / src / client / net.cpp

diff --git a/src/client/net.cpp b/src/client/net.cpp
index 36d598bd9b2ba76681c509483a052f22717d6a6b..b1076ba56c41a98d97cb882168dcecff5118aab3 100644 (file)
--- a/src/client/net.cpp
+++ b/src/client/net.cpp
@@ -294,8 +294,6 @@ uint16_t Client::SendPlayerUpdate(
        auto pack = Packet::Make<Packet::PlayerUpdate>(client_pack);
        pack.WritePredictedState(prediction);
        pack.WriteMovement(movement);
-       pack.WritePitch(pitch);
-       pack.WriteYaw(yaw);
        pack.WriteActions(actions);
        pack.WriteSlot(slot);
        return conn.Send(client_pack, client_sock);
@@ -378,7 +376,7 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
                }
        }
 
-       EntityState &player_state = GetPlayer().GetEntity().GetState();
+       EntityState player_state = GetPlayer().GetEntity().GetState();
        Entity replay(GetPlayer().GetEntity());
        replay.SetState(corrected_state);
 
@@ -420,6 +418,7 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
                displacement *= 0.01f / sqrt(disp_squared);
                player_state.block_pos += displacement;
        }
+       GetPlayer().GetEntity().SetState(player_state);
 }
 
 void NetworkedInput::StartPrimaryAction() {