Skip to content

Commit 0e6bd73

Browse files
committed
fix(triggerevent): Table Crash
1 parent 76db7bd commit 0e6bd73

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/plugins/lua/scripting/events.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
#include "core.h"
22

3-
int AddGlobalEvents(luabridge::LuaRef eventFunction, lua_State *L)
3+
int AddGlobalEvents(luabridge::LuaRef eventFunction, lua_State* L)
44
{
55
if (!eventFunction.isFunction())
66
return 0;
77

8-
Plugin *plugin = FetchPluginByState(L);
8+
Plugin* plugin = FetchPluginByState(L);
99
if (!plugin)
1010
return 0;
1111

1212
plugin->RegisterEventHandler(new luabridge::LuaRef(eventFunction));
1313
return 0;
1414
}
1515

16-
int RegisterEventHandlerPlugin(std::string eventName, lua_State *L)
16+
int RegisterEventHandlerPlugin(std::string eventName, lua_State* L)
1717
{
18-
Plugin *plugin = FetchPluginByState(L);
18+
Plugin* plugin = FetchPluginByState(L);
1919
if (!plugin)
2020
return 0;
2121

2222
plugin->RegisterEventHandling(eventName);
2323
return 0;
2424
}
2525

26-
luabridge::LuaRef TriggerEventInternal(std::string eventName, std::string eventPayload, lua_State *L)
26+
std::vector<luabridge::LuaRef> TriggerEventInternal(std::string eventName, std::string eventPayload, lua_State* L)
2727
{
28-
luabridge::LuaRef returnValue = luabridge::LuaRef::newTable(L);
28+
std::vector<luabridge::LuaRef> returnValues;
2929

3030
PluginEvent event(FetchPluginName(L), nullptr, nullptr);
3131

32-
returnValue.append((int)g_pluginManager->ExecuteEvent(FetchPluginName(L), eventName, eventPayload, &event));
33-
returnValue.append(event);
32+
returnValues.push_back(luabridge::LuaRef(L, (int)g_pluginManager->ExecuteEvent(FetchPluginName(L), eventName, eventPayload, &event)));
33+
returnValues.push_back(luabridge::LuaRef(L, event));
3434

35-
return returnValue;
35+
return returnValues;
3636
}
3737

38-
luabridge::LuaRef GetReturnValueInternal(PluginEvent *event, lua_State *L)
38+
luabridge::LuaRef GetReturnValueInternal(PluginEvent* event, lua_State* L)
3939
{
4040
return LuaSerializeData(event->GetReturnValue(), L);
4141
}
4242

43-
luabridge::LuaRef GetHookReturnValueInternal(PluginEvent *event, lua_State *L)
43+
luabridge::LuaRef GetHookReturnValueInternal(PluginEvent* event, lua_State* L)
4444
{
4545
return LuaSerializeData(event->GetHookReturn(), L);
4646
}
4747

48-
void SetupLuaEvents(LuaPlugin *plugin, lua_State *state)
48+
void SetupLuaEvents(LuaPlugin* plugin, lua_State* state)
4949
{
5050
luabridge::getGlobalNamespace(state)
5151
.addFunction("AddGlobalEvents", AddGlobalEvents)

0 commit comments

Comments
 (0)