diff --git a/Source/lua/lua_global.cpp b/Source/lua/lua_global.cpp index bd8358aa8..af030f25c 100644 --- a/Source/lua/lua_global.cpp +++ b/Source/lua/lua_global.cpp @@ -335,6 +335,11 @@ void LuaEvent(std::string_view name) CallLuaEvent(name); } +void LuaEvent(std::string_view name, std::string_view arg) +{ + CallLuaEvent(name, arg); +} + void LuaEvent(std::string_view name, const Player *player, int arg1, int arg2) { CallLuaEvent(name, player, arg1, arg2); @@ -350,21 +355,6 @@ void LuaEvent(std::string_view name, const Player *player, uint32_t arg1) CallLuaEvent(name, player, arg1); } -void LuaEvent(std::string_view name, std::string_view arg) -{ - if (!CurrentLuaState.has_value()) { - return; - } - - const auto trigger = CurrentLuaState->events.traverse_get>(name, "trigger"); - if (!trigger.has_value() || !trigger->is()) { - LogError("events.{}.trigger is not a function", name); - return; - } - const sol::protected_function fn = trigger->as(); - SafeCallResult(fn(arg), /*optional=*/true); -} - sol::state &GetLuaState() { return CurrentLuaState->sol;