Fix client crash on deletion of an object the clients localplayer is attached to

sapier · sapier · commit 2e19af99199a · 2014-07-06T22:11:21.000+02:00
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -736,7 +736,8 @@ ClientActiveObject* GenericCAO::getParent()
 
 void GenericCAO::removeFromScene(bool permanent)
 {
-	if((m_env != 0) && (permanent)) // Should be true when removing the object permanently and false when refreshing (eg: updating visuals)
+	// Should be true when removing the object permanently and false when refreshing (eg: updating visuals)
+	if((m_env != NULL) && (permanent)) 
 	{
 		for(std::vector<u16>::iterator ci = m_children.begin();
 						ci != m_children.end(); ci++)
@@ -747,6 +748,12 @@ void GenericCAO::removeFromScene(bool permanent)
 		}
 
 		m_env->m_attachements[getId()] = 0;
+		
+		LocalPlayer* player = m_env->getLocalPlayer();
+		if (this == player->parent) {
+			player->parent = NULL;
+			player->isAttached = false;
+		}
 	}
 
 	if(m_meshnode)

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,8 @@ ClientActiveObject* GenericCAO::getParent()`
`736`	`736`
`737`	`737`	`void GenericCAO::removeFromScene(bool permanent)`
`738`	`738`	`{`
`739`		`- if((m_env != 0) && (permanent)) // Should be true when removing the object permanently and false when refreshing (eg: updating visuals)`
	`739`	`+ // Should be true when removing the object permanently and false when refreshing (eg: updating visuals)`
	`740`	`+ if((m_env != NULL) && (permanent))`
`740`	`741`	`{`
`741`	`742`	`for(std::vector<u16>::iterator ci = m_children.begin();`
`742`	`743`	`ci != m_children.end(); ci++)`
`@@ -747,6 +748,12 @@ void GenericCAO::removeFromScene(bool permanent)`
`747`	`748`	`}`
`748`	`749`
`749`	`750`	`m_env->m_attachements[getId()] = 0;`
	`751`	`+`
	`752`	`+ LocalPlayer* player = m_env->getLocalPlayer();`
	`753`	`+ if (this == player->parent) {`
	`754`	`+ player->parent = NULL;`
	`755`	`+ player->isAttached = false;`
	`756`	`+ }`
`750`	`757`	`}`
`751`	`758`
`752`	`759`	`if(m_meshnode)`