X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=920313653ac1104ee91073a2d55df97462e2a4ed;hb=ba93deae894a7e35d95aee32c548ac4e7400c771;hp=d933dc4ec77f86d913d2cd66de5ced6e4a19d65f;hpb=6a3227ca747d0598711f7354cd39897184e9fe6a;p=blank.git

diff --git a/src/world/world.cpp b/src/world/world.cpp
index d933dc4..9203136 100644
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -179,7 +179,6 @@ EntityDerivative Entity::CalculateStep(
 	next.pos.block += delta.position * dt;
 	next.velocity += delta.velocity * dt;
 	limit(next.velocity, max_vel);
-	world.ResolveWorldCollision(*this, next);
 	next.AdjustPosition();
 
 	EntityDerivative out;
@@ -841,7 +840,7 @@ bool World::Intersection(const Entity &e, const EntityState &s, std::vector<Worl
 	ExactLocation::Coarse end(reference + 2);
 
 	bool any = false;
-	for (ExactLocation::Coarse pos(begin); pos.z < end.y; ++pos.z) {
+	for (ExactLocation::Coarse pos(begin); pos.z < end.z; ++pos.z) {
 		for (pos.y = begin.y; pos.y < end.y; ++pos.y) {
 			for (pos.x = begin.x; pos.x < end.x; ++pos.x) {
 				Chunk *chunk = chunks.Get(pos);