ParticleSpawner: Fix crash when attaching to invisible entity

SmallJoker · SmallJoker · commit 57df895cf93d · 2020-06-19T19:29:47.000+02:00
diff --git a/src/client/content_cao.h b/src/client/content_cao.h
@@ -188,10 +188,11 @@ class GenericCAO : public ClientActiveObject
 		return m_matrixnode->getRelativeTransformationMatrix();
 	}
 
-	inline const core::matrix4 &getAbsolutePosRotMatrix() const
+	inline const core::matrix4 *getAbsolutePosRotMatrix() const
 	{
-		assert(m_matrixnode);
-		return m_matrixnode->getAbsoluteTransformation();
+		if (!m_matrixnode)
+			return nullptr;
+		return &m_matrixnode->getAbsoluteTransformation();
 	}
 
 	inline f32 getStepHeight() const
diff --git a/src/client/particles.cpp b/src/client/particles.cpp
@@ -349,7 +349,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment *env)
 	const core::matrix4 *attached_absolute_pos_rot_matrix = nullptr;
 	if (m_attached_id) {
 		if (GenericCAO *attached = dynamic_cast<GenericCAO *>(env->getActiveObject(m_attached_id))) {
-			attached_absolute_pos_rot_matrix = &attached->getAbsolutePosRotMatrix();
+			attached_absolute_pos_rot_matrix = attached->getAbsolutePosRotMatrix();
 		} else {
 			unloaded = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,11 @@ class GenericCAO : public ClientActiveObject`
`188`	`188`	`return m_matrixnode->getRelativeTransformationMatrix();`
`189`	`189`	`}`
`190`	`190`
`191`		`- inline const core::matrix4 &getAbsolutePosRotMatrix() const`
	`191`	`+ inline const core::matrix4 *getAbsolutePosRotMatrix() const`
`192`	`192`	`{`
`193`		`- assert(m_matrixnode);`
`194`		`- return m_matrixnode->getAbsoluteTransformation();`
	`193`	`+ if (!m_matrixnode)`
	`194`	`+ return nullptr;`
	`195`	`+ return &m_matrixnode->getAbsoluteTransformation();`
`195`	`196`	`}`
`196`	`197`
`197`	`198`	`inline f32 getStepHeight() const`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment *env)`
`349`	`349`	`const core::matrix4 *attached_absolute_pos_rot_matrix = nullptr;`
`350`	`350`	`if (m_attached_id) {`
`351`	`351`	`if (GenericCAO attached = dynamic_cast<GenericCAO >(env->getActiveObject(m_attached_id))) {`
`352`		`- attached_absolute_pos_rot_matrix = &attached->getAbsolutePosRotMatrix();`
	`352`	`+ attached_absolute_pos_rot_matrix = attached->getAbsolutePosRotMatrix();`
`353`	`353`	`} else {`
`354`	`354`	`unloaded = true;`
`355`	`355`	`}`