fix: death call several times (#3186)

fix #3177
opentibiabr · Dec 21, 2024 · ba2c41f · ba2c41f
1 parent 13ae9e5
commit ba2c41f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -711,6 +711,10 @@ std::shared_ptr<Item> Creature::getCorpse(const std::shared_ptr<Creature> &, con
 }
 
 void Creature::changeHealth(int32_t healthChange, bool sendHealthChange /* = true*/) {
+	if (isLifeless()) {
+		return;
+	}
+
 	int32_t oldHealth = health;
 
 	if (healthChange > 0) {

diff --git a/src/creatures/creature.hpp b/src/creatures/creature.hpp
@@ -209,7 +209,11 @@ class Creature : virtual public Thing, public SharedObject {
 	}
 
 	bool isAlive() const {
-		return !isDead();
+		return !isLifeless();
+	}
+
+	bool isLifeless() const {
+		return health <= 0;
 	}
 
 	virtual int32_t getMaxHealth() const {

diff --git a/src/creatures/monsters/monster.cpp b/src/creatures/monsters/monster.cpp
@@ -1110,7 +1110,7 @@ void Monster::onThink_async() {
 
 void Monster::doAttacking(uint32_t interval) {
 	const auto &attackedCreature = getAttackedCreature();
-	if (!attackedCreature || (isSummon() && attackedCreature.get() == this)) {
+	if (!attackedCreature || attackedCreature->isLifeless() || (isSummon() && attackedCreature.get() == this)) {
 		return;
 	}