From 86d7f84b899a507e979f1845f2057cce6f84e743 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Sat, 10 Aug 2019 19:45:44 +0200 Subject: Merge pull request #8776 from osjc/FixGetNode Finish getNode cleanup --- src/collision.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/collision.cpp') 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 -- cgit v1.2.3