penalty force collision response

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

diff --git a/src/client/net.cpp b/src/client/net.cpp
index 73931f44c1825ba166a743cafd53c8e9747e4d7c..8a4930410605b7a8eacf0ae0dd8886ef2630ad51 100644 (file)
--- 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;