voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-09 13:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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
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); lua::pop(L);
} }
if (lua::getglobal(L, "item")) { if (lua::getglobal(L, "item")) {
push_properties_tables(L, indices.blocks); push_properties_tables(L, indices.items);
lua::setfield(L, "properties"); lua::setfield(L, "properties");
lua::pop(L); lua::pop(L);
} }

2
src/util/AreaMap2D.hpp
View file

@ -180,7 +180,7 @@ namespace util {
} }
TCoord getHeight() const { TCoord getHeight() const {
return sizeX; return sizeY;
} }
const std::vector<T>& getBuffer() const { 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))) { if (lz == 0 && (chunk = getChunk(cx, cz - 1))) {
chunk->flags.modified = true; 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; chunk->flags.modified = true;
} }
if (lz == CHUNK_D - 1 && (chunk = getChunk(cx, cz + 1))) { if (lz == CHUNK_D - 1 && (chunk = getChunk(cx, cz + 1))) {