Merge branch 'main' into set-new-release-version

opentibiabr · Nov 8, 2023 · 359f9c6 · 359f9c6
2 parents 71f9a4b + 7bba687
commit 359f9c6
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -630,6 +630,14 @@ void Creature::onCreatureMove(const std::shared_ptr<Creature> &creature, const s
 void Creature::onDeath() {
 	bool lastHitUnjustified = false;
 	bool mostDamageUnjustified = false;
+	std::shared_ptr<Creature> lastHitCreature = g_game().getCreatureByID(lastHitCreatureId);
+	std::shared_ptr<Creature> lastHitCreatureMaster;
+	if (lastHitCreature) {
+		lastHitUnjustified = lastHitCreature->onKilledCreature(static_self_cast<Creature>(), true);
+		lastHitCreatureMaster = lastHitCreature->getMaster();
+	} else {
+		lastHitCreatureMaster = nullptr;
+	}
 
 	std::shared_ptr<Creature> mostDamageCreature = nullptr;
 
@@ -671,15 +679,11 @@ void Creature::onDeath() {
 		it.first->onGainExperience(it.second, getCreature());
 	}
 
-	std::shared_ptr<Creature> mostDamageCreatureMaster = nullptr;
-	if (mostDamageCreature) {
-		mostDamageCreatureMaster = mostDamageCreature->getMaster();
-		mostDamageUnjustified = mostDamageCreature->onKilledCreature(getCreature(), false);
-	}
-
-	std::shared_ptr<Creature> lastHitCreature = g_game().getCreatureByID(lastHitCreatureId);
-	if (lastHitCreature && lastHitCreature != mostDamageCreature && lastHitCreature != mostDamageCreatureMaster) {
-		lastHitUnjustified = lastHitCreature->onKilledCreature(getCreature(), true);
+	if (mostDamageCreature && mostDamageCreature != lastHitCreature && mostDamageCreature != lastHitCreatureMaster) {
+		auto mostDamageCreatureMaster = mostDamageCreature->getMaster();
+		if (lastHitCreature != mostDamageCreatureMaster && (lastHitCreatureMaster == nullptr || mostDamageCreatureMaster != lastHitCreatureMaster)) {
+			mostDamageUnjustified = mostDamageCreature->onKilledCreature(static_self_cast<Creature>(), false);
+		}
 	}
 
 	bool droppedCorpse = dropCorpse(lastHitCreature, mostDamageCreature, lastHitUnjustified, mostDamageUnjustified);