BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Attachments: Avoid data loss caused by set_attach() in callbacks (#11181)

Browse Source
This commit is contained in:
SmallJoker 2021-04-13 20:02:18 +02:00 committed by GitHub
parent 4d0fef8ae8
commit bbe120308f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/unit_sao.cpp
View File

@ -134,17 +134,22 @@ void UnitSAO::setAttachment(int parent_id, const std::string &bone, v3f position
int old_parent = m_attachment_parent_id; int old_parent = m_attachment_parent_id;
m_attachment_parent_id = 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_bone = bone;
m_attachment_position = position; m_attachment_position = position;
m_attachment_rotation = rotation; m_attachment_rotation = rotation;
m_force_visible = force_visible; m_force_visible = force_visible;
m_attachment_sent = false; m_attachment_sent = false;
if (parent_id != old_parent) { if (parent_id != old_parent)
onDetach(old_parent);
onAttach(parent_id); onAttach(parent_id);
} }
}
void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position, void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position,
v3f *rotation, bool *force_visible) const v3f *rotation, bool *force_visible) const