diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2019-07-29 19:14:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 19:14:07 +0200 |
| commit | 4aa9a669cb184b77213e8df82eb20eda5aad9004 (patch) | |
| tree | ad252a18613aa7ecfdfee57074585a43c59f2881 /src/content_sao.h | |
| parent | 50052fced51c6a97414472a84aac8ec9bb57d3ee (diff) | |
| download | minetest-4aa9a669cb184b77213e8df82eb20eda5aad9004.tar.gz minetest-4aa9a669cb184b77213e8df82eb20eda5aad9004.tar.bz2 minetest-4aa9a669cb184b77213e8df82eb20eda5aad9004.zip | |
ContentCAO: Fix broken attachments on join (#8701)
What happened:
1) Object data is received. Client begins to read the data
2) Client initializes all its children (gob_cmd_update_infant)
3) Children try to attach to parent (yet not added)
4) Parent initializes, is added to the environment
And somewhere in between, Irrlicht wrecks up the attachments due to the missing matrix node.
The solution here is to:
1) Use the same structure as ServerActiveObject
2) Attach all children after the parent is really initialized
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 9fbddbc5a..0c503b4cb 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -56,12 +56,13 @@ public: void setBonePosition(const std::string &bone, v3f position, v3f rotation); void getBonePosition(const std::string &bone, v3f *position, v3f *rotation); void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation); - void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation); + void getAttachment(int *parent_id, std::string *bone, v3f *position, + v3f *rotation) const; void clearChildAttachments(); void clearParentAttachment(); void addAttachmentChild(int child_id); void removeAttachmentChild(int child_id); - const std::unordered_set<int> &getAttachmentChildIds(); + const std::unordered_set<int> &getAttachmentChildIds() const; ServerActiveObject *getParent() const; ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); |