BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Revert "Detach the player from entities on death." (#5087)

Browse Source
This commit is contained in:
Loïc Blot 2017-01-21 17:30:55 +01:00 committed by GitHub
parent b9c1a758a1
commit bc29e03b59
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/content_sao.cpp
View File

@ -203,16 +203,6 @@ void UnitSAO::getAttachment(int *parent_id, std::string *bone, v3f *position,
*rotation = m_attachment_rotation; *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) void UnitSAO::addAttachmentChild(int child_id)
{ {
m_attachment_child_ids.insert(child_id); m_attachment_child_ids.insert(child_id);

1
src/content_sao.h
View File

@ -49,7 +49,6 @@ public:
void setBonePosition(const std::string &bone, v3f position, v3f rotation); void setBonePosition(const std::string &bone, v3f position, v3f rotation);
void getBonePosition(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 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 getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation);
void addAttachmentChild(int child_id); void addAttachmentChild(int child_id);
void removeAttachmentChild(int child_id); void removeAttachmentChild(int child_id);

15
src/script/lua_api/l_object.cpp
View File

@ -710,7 +710,20 @@ int ObjectRef::l_set_detach(lua_State *L)
ServerActiveObject *co = getobject(ref); ServerActiveObject *co = getobject(ref);
if (co == NULL) if (co == NULL)
return 0; return 0;
co->detachFromParent();
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());
return 0; return 0;
} }

2
src/server.cpp
View File

@ -2560,8 +2560,6 @@ void Server::DiePlayer(u16 peer_id)
if (!playersao) if (!playersao)
return; return;
playersao->detachFromParent();
infostream << "Server::DiePlayer(): Player " infostream << "Server::DiePlayer(): Player "
<< playersao->getPlayer()->getName() << playersao->getPlayer()->getName()
<< " dies" << std::endl; << " dies" << std::endl;

2
src/serverobject.h
View File

@ -166,8 +166,6 @@ public:
{} {}
virtual void removeAttachmentChild(int child_id) virtual void removeAttachmentChild(int child_id)
{} {}
virtual void detachFromParent()
{}
virtual const UNORDERED_SET<int> &getAttachmentChildIds() virtual const UNORDERED_SET<int> &getAttachmentChildIds()
{ static const UNORDERED_SET<int> rv; return rv; } { static const UNORDERED_SET<int> rv; return rv; }
virtual ObjectProperties* accessObjectProperties() virtual ObjectProperties* accessObjectProperties()