diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-01-21 17:30:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-21 17:30:55 +0100 |
| commit | bc29e03b597be350fa856b1ae3d8623778a808b3 (patch) | |
| tree | e43501d0b6edddd83404997e53c38156860f5160 /src/content_sao.cpp | |
| parent | b9c1a758a1e987dfb0284c08dd96d4d17114882f (diff) | |
| download | minetest-bc29e03b597be350fa856b1ae3d8623778a808b3.tar.gz minetest-bc29e03b597be350fa856b1ae3d8623778a808b3.tar.bz2 minetest-bc29e03b597be350fa856b1ae3d8623778a808b3.zip | |
Revert "Detach the player from entities on death." (#5087)
Diffstat (limited to 'src/content_sao.cpp')
| -rw-r--r-- | src/content_sao.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp index f0973082d..bb62aea7d 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -203,16 +203,6 @@ 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); |