BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-05 15:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lua: Call onInit properly

Browse Source
This commit is contained in:
Lion Kortlepel
2021-09-17 02:26:49 +02:00
parent bac476ec34
commit 1880536276
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/TLuaEngine.cpp
View File

@@ -40,11 +40,11 @@ void TLuaEngine::operator()() {
// lua engine main thread
CollectAndInitPlugins();
// now call all onInit's
for (const auto& Pair : mLuaStates) {
auto Res = EnqueueFunctionCall(Pair.first, "onInit", {});
Res->WaitUntilReady(); // FIXME this dumb, dont do this, this is smelly!
if (Res->Error && Res->ErrorMessage != TLuaEngine::BeamMPFnNotFoundError) {
beammp_lua_error("Calling \"onInit\" on \"" + Pair.first + "\" failed: " + Res->ErrorMessage);
auto Futures = TriggerEvent("onInit");
WaitForAll(Futures);
for (const auto& Future : Futures) {
if (Future->Error) {
beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
}
}
// this thread handles timers