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

fix a bug in TriggerLocalEvent which would cause the server to std::terminate()

Browse Source 
it was refusing to push multiple return values onto a result table. Not
sure what changed to make this happen, but oh well.
This commit is contained in:
Lion Kortlepel
2022-12-19 12:41:45 +01:00
parent 8ea7b75874
commit e8ef7de4b9
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/TLuaEngine.cpp
View File

@@ -5,6 +5,7 @@
#include "LuaAPI.h" #include "LuaAPI.h"
#include "TLuaPlugin.h" #include "TLuaPlugin.h"
#include "Uuid.h" #include "Uuid.h"
#include "sol/types.hpp"
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
@@ -514,17 +515,21 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) { sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string& EventName, sol::variadic_args EventArgs) {
// TODO: make asynchronous? // TODO: make asynchronous?
sol::table Result = mStateView.create_table(); auto Result = mStateView.create_table();
for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) { for (const auto& Handler : mEngine->GetEventHandlersForState(EventName, mStateId)) {
auto Fn = mStateView[Handler]; auto Fn = mStateView[Handler];
if (Fn.valid() && Fn.get_type() == sol::type::function) { if (Fn.valid() && Fn.get_type() == sol::type::function) {
auto FnRet = Fn(EventArgs); auto FnRet = Fn(EventArgs);
if (FnRet.valid()) { if (FnRet.valid()) {
Result.add(FnRet); for (const auto& Res : FnRet) {
Result.add(Res);
}
} else { } else {
sol::error Err = FnRet; sol::error Err = FnRet;
beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what()); beammp_lua_error(std::string("TriggerLocalEvent: ") + Err.what());
} }
} else {
beammp_lua_errorf("Handler '{}' for event '{}' in state '{}' is NOT a function, and will be ignored.", Handler, EventName, mStateId);
} }
} }
return Result; return Result;
@@ -790,9 +795,10 @@ TLuaEngine::StateThreadData::StateThreadData(const std::string& Name, TLuaStateI
MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table { MPTable.set_function("TriggerGlobalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table {
return Lua_TriggerGlobalEvent(EventName, EventArgs); return Lua_TriggerGlobalEvent(EventName, EventArgs);
}); });
MPTable.set_function("TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> sol::table { MPTable.set_function(
return Lua_TriggerLocalEvent(EventName, EventArgs); "TriggerLocalEvent", [&](const std::string& EventName, sol::variadic_args EventArgs) -> auto{
}); return Lua_TriggerLocalEvent(EventName, EventArgs);
});
MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent); MPTable.set_function("TriggerClientEvent", &LuaAPI::MP::TriggerClientEvent);
MPTable.set_function("TriggerClientEventJson", &LuaAPI::MP::TriggerClientEventJson); MPTable.set_function("TriggerClientEventJson", &LuaAPI::MP::TriggerClientEventJson);
MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount); MPTable.set_function("GetPlayerCount", &LuaAPI::MP::GetPlayerCount);