Prevent diagonal movement into blocks

Fixed in Craft pull request fogleman#216 from usernamefreaks. Bug report: fogleman#209
pspiworld · Oct 25, 2019 · 47daa08 · 47daa08
1 parent 34de1dc
commit 47daa08
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/src/main.c b/src/main.c
@@ -897,6 +897,36 @@ int collide(int height, float *x, float *y, float *z) {
         if (pz > pad && is_obstacle(map_get(map, nx, ny - dy, nz + 1))) {
             *z = nz + pad;
         }
+
+        // check the 4 diagonally neighboring blocks for obstacle as well
+        if (px < -pad && pz > pad && is_obstacle(map_get(map, nx - 1, ny - dy, nz + 1))) {
+            if(ABS(px) < ABS(pz)) {
+                *x = nx - pad;
+            } else {
+                *z = nz + pad;
+            }
+        }
+        if (px > pad && pz > pad && is_obstacle(map_get(map, nx + 1, ny - dy, nz + 1))) {
+            if(ABS(px) < ABS(pz)) {
+                *x = nx + pad;
+            } else {
+                *z = nz + pad;
+            }
+        }
+        if (px < -pad && pz < -pad && is_obstacle(map_get(map, nx - 1, ny - dy, nz - 1))) {
+            if(ABS(px) < ABS(pz)) {
+                *x = nx - pad;
+            } else {
+                *z = nz - pad;
+            }
+        }
+        if (px > pad && pz < -pad && is_obstacle(map_get(map, nx + 1, ny - dy, nz - 1))) {
+            if(ABS(px) < ABS(pz)) {
+                *x = nx + pad;
+            } else {
+                *z = nz - pad;
+            }
+        }
     }
     return result;
 }