X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fnet.cpp;h=c3bbb67b40be4d8c7b81ab3d67a62f3ed0cff81b;hb=54f3f1260b95a924fcb40d9d6de3fa2e2c382f6f;hp=73931f44c1825ba166a743cafd53c8e9747e4d7c;hpb=d38be21d103052761505d58a6d13e30a896dde01;p=blank.git

diff --git a/src/client/net.cpp b/src/client/net.cpp
index 73931f4..c3bbb67 100644
--- a/src/client/net.cpp
+++ b/src/client/net.cpp
@@ -332,12 +332,12 @@ void NetworkedInput::PushPlayerUpdate(int dt) {
 		InventorySlot()
 	);
 	if (player_hist.size() < 16) {
-		player_hist.emplace_back(state, GetPlayer().GetEntity().TargetVelocity(), dt, packet);
+		player_hist.emplace_back(state, GetPlayer().GetEntity().TargetVelocity(), dt * 0.001f, packet);
 	} else {
 		auto entry = player_hist.begin();
 		entry->state = state;
 		entry->tgt_vel = GetPlayer().GetEntity().TargetVelocity();
-		entry->delta_t = dt;
+		entry->delta_t = dt * 0.001f;
 		entry->packet = packet;
 		player_hist.splice(player_hist.end(), player_hist, entry);
 	}
@@ -380,11 +380,7 @@ void NetworkedInput::MergePlayerCorrection(uint16_t seq, const EntityState &corr
 	while (entry != end) {
 		replay.Velocity(entry->state.velocity);
 		replay.TargetVelocity(entry->tgt_vel);
-		replay.Update(entry->delta_t);
-		if (GetWorld().Intersection(replay, col)) {
-			GetWorld().Resolve(replay, col);
-			col.clear();
-		}
+		GetWorld().Update(replay, entry->delta_t);
 		entry->state.chunk_pos = replay.GetState().chunk_pos;
 		entry->state.block_pos = replay.GetState().block_pos;
 		++entry;