oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-06 17:41:04 +00:00
Code Wiki Activity

Attachments: Fix attachments to temporary removed objects (#8989)

Browse source 
Does not clear the parent's attachment information when the child is deleted locally.
Either it was removed permanently, or just temporary - we don't know, but it's up to the server to send a *detach from child" packet for the parent.
This commit is contained in:
SmallJoker 2019-10-02 19:11:27 +02:00 • committed by GitHub
parent 251038e136
commit 81c2370c8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/client/content_cao.cpp
View file

@ -523,7 +523,9 @@ void GenericCAO::removeFromScene(bool permanent)
// Should be true when removing the object permanently
// and false when refreshing (eg: updating visuals)
if (m_env && permanent) {
clearChildAttachments();
// The client does not know whether this object does re-appear to
// a later time, thus do not clear child attachments.
clearParentAttachment();
}
@ -1330,10 +1332,17 @@ void GenericCAO::updateAttachments()
m_attached_to_local = parent && parent->isLocalPlayer();
if (!parent && m_attachment_parent_id) {
//m_is_visible = false; maybe later. needs better handling
return;
}
/*
Following cases exist:
m_attachment_parent_id == 0 && !parent
This object is not attached
m_attachment_parent_id != 0 && parent
This object is attached
m_attachment_parent_id != 0 && !parent
This object will be attached as soon the parent is known
m_attachment_parent_id == 0 && parent
Impossible case
*/
if (!parent) { // Detach or don't attach
if (m_matrixnode) {