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

Merge pull request #606 from MihailRis/fix-generated-item-tags

Browse Source 
fix: generated item does not inherit block tags
This commit is contained in:
MihailRis 2025-09-10 01:25:42 +03:00 committed by GitHub
commit 17d339e373
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/content/ContentLoader.cpp
View File

@ -288,6 +288,7 @@ void ContentLoader::loadContent(const dv::value& root) {
item.iconType = ItemIconType::BLOCK; item.iconType = ItemIconType::BLOCK;
item.icon = def.name; item.icon = def.name;
item.placingBlock = def.name; item.placingBlock = def.name;
item.tags = def.tags;
for (uint j = 0; j < 4; j++) { for (uint j = 0; j < 4; j++) {
item.emission[j] = def.emission[j]; item.emission[j] = def.emission[j];

1
src/items/ItemDef.cpp
View File

@ -19,4 +19,5 @@ void ItemDef::cloneTo(ItemDef& dst) {
dst.modelName = modelName; dst.modelName = modelName;
dst.uses = uses; dst.uses = uses;
dst.usesDisplay = usesDisplay; dst.usesDisplay = usesDisplay;
dst.tags = tags;
} }

1
src/voxels/Block.cpp
View File

@ -155,6 +155,7 @@ void Block::cloneTo(Block& dst) {
dst.tickInterval = tickInterval; dst.tickInterval = tickInterval;
dst.overlayTexture = overlayTexture; dst.overlayTexture = overlayTexture;
dst.translucent = translucent; dst.translucent = translucent;
dst.tags = tags;
if (particles) { if (particles) {
dst.particles = std::make_unique<ParticlesPreset>(*particles); dst.particles = std::make_unique<ParticlesPreset>(*particles);
} }