X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fclient%2Fnet.cpp;h=8a4930410605b7a8eacf0ae0dd8886ef2630ad51;hb=8639a90bcbcd045c57cd489f02a25e0df4236deb;hp=73931f44c1825ba166a743cafd53c8e9747e4d7c;hpb=d38be21d103052761505d58a6d13e30a896dde01;p=blank.git diff --git a/src/client/net.cpp b/src/client/net.cpp index 73931f4..8a49304 100644 --- a/src/client/net.cpp +++ b/src/client/net.cpp @@ -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;