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

Merge pull request #805 from clasher113/main

Browse source 
bug fix
This commit is contained in:
MihailRis 2026-03-02 01:07:18 +03:00 • committed by GitHub
commit dc27bd1430
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 149 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -121,8 +121,8 @@ template<> void ContentUnitLoader<Block>::loadUnit(
}
def.variants = std::make_unique<Variants>();
def.variants->offset = 0;
def.variants->mask = 0xF;
def.variants->offset = offset;
def.variants->mask = (1ULL << bitsCount) - 1;
def.variants->variants.push_back(def.defaults);
for (int i = 0; i < variants.size(); i++) {
Variant variant = def.defaults;
@ -220,6 +220,15 @@ template<> void ContentUnitLoader<Block>::loadUnit(
def.defaults.model.type = BlockModelType::AABB;
def.hitboxes = {AABB(def.size)};
}
// grounding behaviour
if (root.has("grounding-behaviour")) {
std::string groundingBehaviourName = GroundingBehaviourMeta.getNameString(def.groundingBehaviour);
root.at("grounding-behaviour").get(groundingBehaviourName);
if (!GroundingBehaviourMeta.getItem(groundingBehaviourName, def.groundingBehaviour)) {
logger.error() << "unknown grounding behaviour: " << groundingBehaviourName;
}
}
}
// primitive properties