diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua index 5a6fa228..9fd7dc5e 100644 --- a/res/content/base/scripts/components/drop.lua +++ b/res/content/base/scripts/components/drop.lua @@ -30,8 +30,8 @@ do -- setup visuals local bid = block.index(icon:sub(16)) model = block.get_model(bid) if model == "X" then - entity:set_skeleton("base:drop-item") body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) + rig:set_model(0, "drop-item") rig:set_texture("$0", icon) else if model == "aabb" then @@ -46,8 +46,8 @@ do -- setup visuals end end else - entity:set_skeleton("base:drop-item") body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) + rig:set_model(0, "drop-item") rig:set_texture("$0", icon) end mat4.mul(matrix, rotation, matrix) diff --git a/res/content/base/skeletons/drop-item.json b/res/content/base/skeletons/drop-item.json deleted file mode 100644 index 18afe6a2..00000000 --- a/res/content/base/skeletons/drop-item.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "root": { - "model": "drop-item" - } -} diff --git a/src/objects/rigging.cpp b/src/objects/rigging.cpp index 82552464..ecf8e2d5 100644 --- a/src/objects/rigging.cpp +++ b/src/objects/rigging.cpp @@ -94,7 +94,7 @@ void SkeletonConfig::render( node->model.refresh(assets); auto model = node->model.model; auto& modelOverride = skeleton.modelOverrides.at(i); - if (!modelOverride.updateFlag) { + if (modelOverride.updateFlag) { modelOverride.refresh(assets); } model = modelOverride.model ? modelOverride.model : model;