PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into headless-mode

Browse Source
This commit is contained in:
MihailRis 2024-12-08 01:39:45 +03:00
commit eaffc0cb57
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/scripting/scripting.cpp
View File

@ -245,7 +245,7 @@ void scripting::on_content_load(Content* content) {
lua::pop(L);
}
if (lua::getglobal(L, "item")) {
push_properties_tables(L, indices.blocks);
push_properties_tables(L, indices.items);
lua::setfield(L, "properties");
lua::pop(L);
}

2
src/util/AreaMap2D.hpp
View File

@ -180,7 +180,7 @@ namespace util {
}
TCoord getHeight() const {
return sizeX;
return sizeY;
}
const std::vector<T>& getBuffer() const {

2
src/voxels/Chunks.cpp
View File

@ -422,7 +422,7 @@ void Chunks::set(
if (lz == 0 && (chunk = getChunk(cx, cz - 1))) {
chunk->flags.modified = true;
}
if (lx == CHUNK_W - 1 && (chunk = getChunk(cx, cz))) {
if (lx == CHUNK_W - 1 && (chunk = getChunk(cx + 1, cz))) {
chunk->flags.modified = true;
}
if (lz == CHUNK_D - 1 && (chunk = getChunk(cx, cz + 1))) {