5 files changed, 16 insertions, 14 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index bf8282af4..d6581144f 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -203,6 +203,16 @@ void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position,
 	*rotation = m_attachment_rotation;
 }
 
+void UnitSAO::detachFromParent()
+{
+	ServerActiveObject *parent = NULL;
+	if (m_attachment_parent_id)
+		parent = m_env->getActiveObject(m_attachment_parent_id);
+	setAttachment(NULL, "", v3f(0, 0, 0), v3f(0, 0, 0));
+	if (parent != NULL)
+		parent->removeAttachmentChild(m_id);
+}
+
 void UnitSAO::addAttachmentChild(int child_id)
 {
 	m_attachment_child_ids.insert(child_id);
diff --git a/src/content_sao.h b/src/content_sao.h
index 4abe93250..884f0f406 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -49,6 +49,7 @@ 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 detachFromParent();
 	void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
 	void addAttachmentChild(int child_id);
 	void removeAttachmentChild(int child_id);
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 59c04f301..f579c0b86 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -710,20 +710,7 @@ int ObjectRef::l_set_detach(lua_State *L)
 	ServerActiveObject *co = getobject(ref);
 	if (co == NULL)
 		return 0;
-
-	int parent_id = 0;
-	std::string bone = "";
-	v3f position;
-	v3f rotation;
-	co->getAttachment(&parent_id, &bone, &position, &rotation);
-	ServerActiveObject *parent = NULL;
-	if (parent_id)
-		parent = env->getActiveObject(parent_id);
-
-	// Do it
-	co->setAttachment(0, "", v3f(0,0,0), v3f(0,0,0));
-	if (parent != NULL)
-		parent->removeAttachmentChild(co->getId());
+	co->detachFromParent();
 	return 0;
 }
 
diff --git a/src/server.cpp b/src/server.cpp
index 1656b9f5a..1e5704042 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2560,6 +2560,8 @@ void Server::DiePlayer(u16 peer_id)
 	if (!playersao)
 		return;
 
+	playersao->detachFromParent();
+
 	infostream << "Server::DiePlayer(): Player "
 			<< playersao->getPlayer()->getName()
 			<< " dies" << std::endl;
diff --git a/src/serverobject.h b/src/serverobject.h
index 38204980e..dfe6312f0 100644
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -166,6 +166,8 @@ public:
 	{}
 	virtual void removeAttachmentChild(int child_id)
 	{}
+	virtual void detachFromParent()
+	{}
 	virtual const UNORDERED_SET<int> &getAttachmentChildIds()
 	{ static const UNORDERED_SET<int> rv; return rv; }
 	virtual ObjectProperties* accessObjectProperties()