diff options
| author | Minetest-j45 <55553015+Minetest-j45@users.noreply.github.com> | 2021-08-30 15:22:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 15:22:40 +0100 |
| commit | 7824a4956bf489b4e2cc35e0c97272eee06be6ba (patch) | |
| tree | 70243765dc1743a83596f9c6eec122fb417ef92c /src/server/unit_sao.cpp | |
| parent | 607add326feb44e078b843464ce4a8de09f28743 (diff) | |
| parent | 35445d24f425c6291a0580b468919ca83de716fd (diff) | |
| download | dragonfireclient-7824a4956bf489b4e2cc35e0c97272eee06be6ba.tar.xz | |
Merge pull request #1 from EliasFleckenstein03/master
update
Diffstat (limited to 'src/server/unit_sao.cpp')
| -rw-r--r-- | src/server/unit_sao.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/server/unit_sao.cpp b/src/server/unit_sao.cpp index 2371640ca..fa6c8f0f4 100644 --- a/src/server/unit_sao.cpp +++ b/src/server/unit_sao.cpp @@ -134,16 +134,21 @@ void UnitSAO::setAttachment(int parent_id, const std::string &bone, v3f position int old_parent = m_attachment_parent_id; m_attachment_parent_id = parent_id; + + // The detach callbacks might call to setAttachment() again. + // Ensure the attachment params are applied after this callback is run. + if (parent_id != old_parent) + onDetach(old_parent); + + m_attachment_parent_id = parent_id; m_attachment_bone = bone; m_attachment_position = position; m_attachment_rotation = rotation; m_force_visible = force_visible; m_attachment_sent = false; - if (parent_id != old_parent) { - onDetach(old_parent); + if (parent_id != old_parent) onAttach(parent_id); - } } void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position, |