mirror of
https://github.com/moparisthebest/minetest
synced 2024-12-23 16:08:51 -05:00
Fix falling through nodes on world load (fixes #2784)
On world load the collision code can not see node boxes, since the nodes have not been loaded. Thus it collided only at the next full node. However, standing on a slab on world load leaded to sinking into it until the world finished loading. Then one maybe fell further, if the node below was not walkable. Now, with this commit, when no node around the player has been loaded it simply does not move the player.
This commit is contained in:
parent
776760aba7
commit
8787d2e7e9
@ -245,6 +245,8 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||||||
s16 max_y = MYMAX(oldpos_i.Y, newpos_i.Y) + (box_0.MaxEdge.Y / BS) + 1;
|
s16 max_y = MYMAX(oldpos_i.Y, newpos_i.Y) + (box_0.MaxEdge.Y / BS) + 1;
|
||||||
s16 max_z = MYMAX(oldpos_i.Z, newpos_i.Z) + (box_0.MaxEdge.Z / BS) + 1;
|
s16 max_z = MYMAX(oldpos_i.Z, newpos_i.Z) + (box_0.MaxEdge.Z / BS) + 1;
|
||||||
|
|
||||||
|
bool any_position_valid = false;
|
||||||
|
|
||||||
for(s16 x = min_x; x <= max_x; x++)
|
for(s16 x = min_x; x <= max_x; x++)
|
||||||
for(s16 y = min_y; y <= max_y; y++)
|
for(s16 y = min_y; y <= max_y; y++)
|
||||||
for(s16 z = min_z; z <= max_z; z++)
|
for(s16 z = min_z; z <= max_z; z++)
|
||||||
@ -257,6 +259,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||||||
if (is_position_valid) {
|
if (is_position_valid) {
|
||||||
// Object collides into walkable nodes
|
// Object collides into walkable nodes
|
||||||
|
|
||||||
|
any_position_valid = true;
|
||||||
const ContentFeatures &f = gamedef->getNodeDefManager()->get(n);
|
const ContentFeatures &f = gamedef->getNodeDefManager()->get(n);
|
||||||
if(f.walkable == false)
|
if(f.walkable == false)
|
||||||
continue;
|
continue;
|
||||||
@ -289,6 +292,12 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||||||
is_object.push_back(false);
|
is_object.push_back(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Do not move if world has not loaded yet, since custom node boxes
|
||||||
|
// are not available for collision detection.
|
||||||
|
if (!any_position_valid)
|
||||||
|
return result;
|
||||||
|
|
||||||
} // tt2
|
} // tt2
|
||||||
|
|
||||||
if(collideWithObjects)
|
if(collideWithObjects)
|
||||||
@ -298,7 +307,6 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||||||
|
|
||||||
/* add object boxes to cboxes */
|
/* add object boxes to cboxes */
|
||||||
|
|
||||||
|
|
||||||
std::vector<ActiveObject*> objects;
|
std::vector<ActiveObject*> objects;
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
|
ClientEnvironment *c_env = dynamic_cast<ClientEnvironment*>(env);
|
||||||
|
Loading…
Reference in New Issue
Block a user