deprecate

opentibiabr · Oct 28, 2023 · 49021a9 · 49021a9
1 parent 0e9646e
commit 49021a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/lua/creature/creatureevent.cpp b/src/lua/creature/creatureevent.cpp
@@ -326,8 +326,14 @@ bool CreatureEvent::executeAdvance(std::shared_ptr<Player> player, skills_t skil
 	return getScriptInterface()->callFunction(4);
 }
 
+/**
+ * @deprecated Prefer using registered onDeath events instead for better performance.
+ */
 void CreatureEvent::executeOnKill(std::shared_ptr<Creature> creature, std::shared_ptr<Creature> target, bool lastHit) const {
 	// onKill(creature, target, lastHit)
+	g_logger().warn("[CreatureEvent::executeOnKill - Creature {} target {} event {}] "
+					"Deprecated use of onKill event. Use registered onDeath events instead for better performance.",
+					creature->getName(), target->getName(), getName());
 	if (!getScriptInterface()->reserveScriptEnv()) {
 		g_logger().error("[CreatureEvent::executeOnKill - Creature {} target {} event {}] "
 						 "Call stack overflow. Too many lua script calls being nested.",

diff --git a/src/lua/functions/creatures/monster/monster_type_functions.cpp b/src/lua/functions/creatures/monster/monster_type_functions.cpp
@@ -13,6 +13,7 @@
 #include "io/io_bosstiary.hpp"
 #include "creatures/combat/spells.hpp"
 #include "creatures/monsters/monsters.hpp"
+#include "creatures/monsters/monster.hpp"
 #include "lua/functions/creatures/monster/monster_type_functions.hpp"
 #include "lua/scripts/scripts.hpp"
 
@@ -1002,7 +1003,13 @@ int MonsterTypeFunctions::luaMonsterTypeRegisterEvent(lua_State* L) {
 	// monsterType:registerEvent(name)
 	const auto monsterType = getUserdataShared<MonsterType>(L, 1);
 	if (monsterType) {
-		monsterType->info.scripts.push_back(getString(L, 2));
+		auto eventName = getString(L, 2);
+		monsterType->info.scripts.push_back(eventName);
+		for (const auto &[_, monster] : g_game().getMonsters()) {
+			if (monster->getMonsterType() == monsterType) {
+				monster->registerCreatureEvent(eventName);
+			}
+		}
 		pushBoolean(L, true);
 	} else {
 		lua_pushnil(L);