mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-11 14:01:49 +00:00
Merge branch 'main' into lua_audio
This commit is contained in:
commit
aac3ab74fa
1 changed files with 6 additions and 2 deletions
|
|
@ -55,8 +55,12 @@ const AABB* Chunks::isObstacleAt(float x, float y, float z){
|
||||||
int iz = floor(z);
|
int iz = floor(z);
|
||||||
voxel* v = get(ix, iy, iz);
|
voxel* v = get(ix, iy, iz);
|
||||||
if (v == nullptr) {
|
if (v == nullptr) {
|
||||||
static const AABB empty;
|
if (iy >= CHUNK_H) {
|
||||||
return ∅
|
return nullptr;
|
||||||
|
} else {
|
||||||
|
static const AABB empty;
|
||||||
|
return ∅
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const Block* def = contentIds->getBlockDef(v->id);
|
const Block* def = contentIds->getBlockDef(v->id);
|
||||||
if (def->obstacle) {
|
if (def->obstacle) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue