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

Merge branch 'rc-v3.0.2' into rc-v3.1.0

Browse Source 
This is a periodic merge to keep 3.1.0 up to date with 3.0.2
This commit is contained in:
Lion Kortlepel
2022-03-31 22:10:49 +02:00
parent d86efabb1a d01d79a49a
commit 104737571c
10 changed files with 154 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -133,7 +133,7 @@ int BeamMPServerMain(MainArguments Arguments) {
});
Application::RegisterShutdownHandler([] {
auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", "");
TLuaEngine::WaitForAll(Futures);
TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5));
});
TServer Server(Arguments.List);