diff options
| author | Jozef Behran <jozuejozef@gmail.com> | 2019-08-10 19:45:44 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2019-08-10 19:45:44 +0200 |
| commit | 86d7f84b899a507e979f1845f2057cce6f84e743 (patch) | |
| tree | ec2d965d61bd639fe879f971b98e30bccab63b52 /src/collision.cpp | |
| parent | 291e7730cf24ba5081f10b5ddbf2494951333827 (diff) | |
| download | minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.gz minetest-86d7f84b899a507e979f1845f2057cce6f84e743.tar.bz2 minetest-86d7f84b899a507e979f1845f2057cce6f84e743.zip | |
Merge pull request #8776 from osjc/FixGetNode
Finish getNode cleanup
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index b36cc89b0..e911e6f8c 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -206,7 +206,7 @@ bool wouldCollideWithCeiling( static inline void getNeighborConnectingFace(const v3s16 &p, const NodeDefManager *nodedef, Map *map, MapNode n, int v, int *neighbors) { - MapNode n2 = map->getNodeNoEx(p); + MapNode n2 = map->getNode(p); if (nodedef->nodeboxConnects(n, n2, v)) *neighbors |= v; } @@ -278,7 +278,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, for (p.Y = min.Y; p.Y <= max.Y; p.Y++) for (p.Z = min.Z; p.Z <= max.Z; p.Z++) { bool is_position_valid; - MapNode n = map->getNodeNoEx(p, &is_position_valid); + MapNode n = map->getNode(p, &is_position_valid); if (is_position_valid && n.getContent() != CONTENT_IGNORE) { // Object collides into walkable nodes |