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

[oweals/minetest.git] / src / client / clientenvironment.cpp

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index e1b20ec8498397969b3837a462d210bb63ef4f72..5eb0333029fd11743d150a8c6997a22b5d481324 100644 (file)
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -402,6 +402,23 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type,
        }
 }
 
+
+void ClientEnvironment::removeActiveObject(u16 id)
+{
+       // Get current attachment childs to detach them visually
+       std::unordered_set<int> attachment_childs;
+       if (auto *obj = getActiveObject(id))
+               attachment_childs = obj->getAttachmentChildIds();
+
+       m_ao_manager.removeObject(id);
+
+       // Perform a proper detach in Irrlicht
+       for (auto c_id : attachment_childs) {
+               if (ClientActiveObject *child = getActiveObject(c_id))
+                       child->updateAttachments();
+       }
+}
+
 void ClientEnvironment::processActiveObjectMessage(u16 id, const std::string &data)
 {
        ClientActiveObject *obj = getActiveObject(id);