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

Report errors on WaitForAll

Browse Source
This commit is contained in:
Lion Kortlepel
2021-10-01 03:56:18 +02:00
parent 9eabd19e17
commit d1f890752a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/TLuaEngine.cpp
View File

@@ -65,7 +65,7 @@ void TLuaEngine::operator()() {
} }
} }
if (Res->Error) { if (Res->Error) {
beammp_lua_error(Res->ErrorMessage); beammp_lua_error(Res->Function + ": " + Res->ErrorMessage);
} }
} }
} }
@@ -139,6 +139,9 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results) {
while (!Result->Ready) { while (!Result->Ready) {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
} }
if (Result->Error) {
beammp_lua_error(Result->Function + ": " + Result->ErrorMessage);
}
} }
} }

2
src/TNetwork.cpp
View File

@@ -331,8 +331,6 @@ void TNetwork::Authentication(const TConnection& ClientConnection) {
return; return;
} }
LuaAPI::MP::Engine->ReportErrors(Futures);
if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) { if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
beammp_info("Identification success"); beammp_info("Identification success");
mServer.InsertClient(Client); mServer.InsertClient(Client);