X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=199343c33103d2c7377fff7338f0594e6852f96b;hb=da355888d84cba0a712e1b8227156c1f08327bba;hp=d2b05d66850e96923704bfd262335af5cc464832;hpb=e4a1425dccd0ba9b106e415dd02809f4308a85ee;p=blank.git

diff --git a/src/world/world.cpp b/src/world/world.cpp
index d2b05d6..199343c 100644
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -699,11 +699,19 @@ glm::vec3 World::CombinedInterpenetration(
 	glm::vec3 max_pen(0.0f);
 	for (const WorldCollision &c : col) {
 		if (!c.Blocks()) continue;
-		glm::vec3 local_pen(c.normal * c.depth);
+		glm::vec3 normal(c.normal);
 		// swap if neccessary (normal may point away from the entity)
-		if (dot(c.normal, state.RelativePosition(c.ChunkPos()) - c.BlockCoords()) > 0) {
-			local_pen *= -1;
+		if (dot(normal, state.RelativePosition(c.ChunkPos()) - c.BlockCoords()) < 0) {
+			normal = -normal;
 		}
+		// check if block surface is "inside"
+		Block::Face coll_face = Block::NormalFace(normal);
+		BlockLookup neighbor(c.chunk, c.BlockPos(), coll_face);
+		if (neighbor && neighbor.FaceFilled(Block::Opposite(coll_face))) {
+			// yep, so ignore this contact
+			continue;
+		}
+		glm::vec3 local_pen(normal * c.depth);
 		min_pen = min(min_pen, local_pen);
 		max_pen = max(max_pen, local_pen);
 	}