Merge pull request luanti-org#431 from sapier/dtime_clamping

kwolekr · kwolekr · commit f9a8efb99235 · 2013-02-22T16:42:50.000-08:00
add limit for (collision handling) steps to avoid runaway memory consumption
diff --git a/src/collision.cpp b/src/collision.cpp
@@ -199,6 +199,10 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
 	/*
 		Calculate new velocity
 	*/
+	if( dtime > 0.5 ) {
+		infostream<<"collisionMoveSimple: WARNING: maximum step interval exceeded, lost movement details!"<<std::endl;
+		dtime = 0.5;
+	}
 	speed_f += accel_f * dtime;
 
     // If there is no speed, there are no collisions
