Fix unwanted detaching when damage = 0

programmerjake · sfan5 · commit 76032159bd49 · 2019-10-05T15:45:05.000+02:00
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
@@ -1555,7 +1555,7 @@ void GenericCAO::processMessage(const std::string &data)
 
 		if (damage > 0)
 		{
-			if (m_hp <= 0)
+			if (m_hp == 0)
 			{
 				// TODO: Execute defined fast response
 				// As there is no definition, make a smoke puff
@@ -1571,7 +1571,9 @@ void GenericCAO::processMessage(const std::string &data)
 					m_reset_textures_timer += 0.05 * damage;
 				updateTextures(m_current_texture_modifier + "^[brighten");
 			}
-		} else {
+		}
+
+		if (m_hp == 0) {
 			// Same as 'Server::DiePlayer'
 			clearParentAttachment();
 			// Same as 'ObjectRef::l_remove'

Original file line number	Diff line number	Diff line change
`@@ -1555,7 +1555,7 @@ void GenericCAO::processMessage(const std::string &data)`
`1555`	`1555`
`1556`	`1556`	`if (damage > 0)`
`1557`	`1557`	`{`
`1558`		`- if (m_hp <= 0)`
	`1558`	`+ if (m_hp == 0)`
`1559`	`1559`	`{`
`1560`	`1560`	`// TODO: Execute defined fast response`
`1561`	`1561`	`// As there is no definition, make a smoke puff`
`@@ -1571,7 +1571,9 @@ void GenericCAO::processMessage(const std::string &data)`
`1571`	`1571`	`m_reset_textures_timer += 0.05 * damage;`
`1572`	`1572`	`updateTextures(m_current_texture_modifier + "^[brighten");`
`1573`	`1573`	`}`
`1574`		`- } else {`
	`1574`	`+ }`
	`1575`	`+`
	`1576`	`+ if (m_hp == 0) {`
`1575`	`1577`	`// Same as 'Server::DiePlayer'`
`1576`	`1578`	`clearParentAttachment();`
`1577`	`1579`	`// Same as 'ObjectRef::l_remove'`