Fixed on death events for monsters that don't have corpses (#305)

onDeath events not working for corpseless monsters Added a sanity check to ensure the corpse is not used by monsters that don't have a corpse
opentibiabr · Apr 17, 2022 · 6db7c30 · 6db7c30
1 parent f50096b
commit 6db7c30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/creatures/creature.cpp b/src/creatures/creature.cpp
@@ -759,7 +759,7 @@ bool Creature::dropCorpse(Creature* lastHitCreature, Creature* mostDamageCreatur
 
 		// Scripting event onDeath
 		for (CreatureEvent* deathEvent : getCreatureEvents(CREATURE_EVENT_DEATH)) {
-			if (deathEvent && corpse) {
+			if (deathEvent) {
 				deathEvent->executeOnDeath(this, corpse, lastHitCreature, mostDamageCreature, lastHitUnjustified, mostDamageUnjustified);
 			}
 		}

diff --git a/src/lua/creature/creatureevent.cpp b/src/lua/creature/creatureevent.cpp
@@ -377,7 +377,9 @@ bool CreatureEvent::executeOnDeath(Creature* creature, Item* corpse, Creature* k
 	LuaScriptInterface::pushUserdata<Creature>(L, creature);
 	LuaScriptInterface::setCreatureMetatable(L, -1, creature);
 
-	LuaScriptInterface::pushThing(L, corpse);
+	if (corpse && corpse != 0) {
+		LuaScriptInterface::pushThing(L, corpse);
+	}
 
 	if (killer) {
 		LuaScriptInterface::pushUserdata<Creature>(L, killer);