voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-12 14:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #723 from MihailRis/fixes

Browse source 
0.30.5 patch
This commit is contained in:
MihailRis 2025-12-05 12:13:17 +03:00 • committed by GitHub
commit e0f037919f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/content/loading/BlockLoader.cpp
View file

@ -247,5 +247,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) { if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
def.pickingItem = CORE_EMPTY; def.pickingItem = CORE_EMPTY;
} }
def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua"; if (root.has("script-name") || def.scriptFile.empty()) {
def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua";
}
} }

6
src/voxels/blocks_agent.cpp
View file

@ -160,12 +160,6 @@ static void initialize_block(
block_register_events.push_back(BlockRegisterEvent { block_register_events.push_back(BlockRegisterEvent {
static_cast<uint8_t>(bits | 1), def.rt.id, {x, y, z} static_cast<uint8_t>(bits | 1), def.rt.id, {x, y, z}
}); });
if (def.rt.funcsset.onblocktick) {
block_register_events.push_back(BlockRegisterEvent {
bits, def.rt.id, {x, y, z}
});
}
} }
template <class Storage> template <class Storage>