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/serverobject.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/serverobject.h')
| -rw-r--r-- | src/serverobject.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/serverobject.h b/src/serverobject.h index 4a9430107..42eed0710 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -161,17 +161,7 @@ public: {} virtual void getBonePosition(const std::string &bone, v3f *position, v3f *lotation) {} - virtual void setAttachment(int parent_id, const std::string &bone, v3f position, v3f rotation) - {} - virtual void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation) - {} - virtual void clearChildAttachments() {} - virtual void clearParentAttachment() {} - virtual void addAttachmentChild(int child_id) - {} - virtual void removeAttachmentChild(int child_id) - {} - virtual const std::unordered_set<int> &getAttachmentChildIds() + virtual const std::unordered_set<int> &getAttachmentChildIds() const { static std::unordered_set<int> rv; return rv; } virtual ServerActiveObject *getParent() const { return nullptr; } virtual ObjectProperties* accessObjectProperties() |