Merge branch 'main' into vcm-bones

This commit is contained in:
MihailRis 2026-01-10 23:28:11 +03:00
commit e01cc25f7c
8 changed files with 22 additions and 12 deletions

View file

@ -53,6 +53,9 @@ Decorator::Decorator(
addParticles(def, pos);
}
});
playerNamePreset.deserialize(engine.getResPaths().readCombinedObject(
"presets/text3d/player_name.toml"
));
for (const auto& [id, player] : *level.players) {
if (id == this->player.getId()) {
continue;
@ -63,9 +66,6 @@ Decorator::Decorator(
player->getPosition()
));
}
playerNamePreset.deserialize(engine.getResPaths().readCombinedObject(
"presets/text3d/player_name.toml"
));
}
void Decorator::addParticles(const Block& def, const glm::ivec3& pos) {