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

Nice fix.

Browse Source
This commit is contained in:
Lion Kortlepel
2021-09-17 02:36:06 +02:00
parent 62fd369625
commit ed6f5282d9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TLuaEngine.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ void TLuaEngine::operator()() {
auto Futures = TriggerEvent("onInit"); auto Futures = TriggerEvent("onInit");
WaitForAll(Futures); WaitForAll(Futures);
for (const auto& Future : Futures) { for (const auto& Future : Futures) {
if (Future->Error) { if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) {
beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage); beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage);
} }
} }
src/TNetwork.cpp
+4
View File
@@ -114,7 +114,11 @@ void TNetwork::TCPServerMain() {
TConnection client {}; TConnection client {};
SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
int optval = 1; int optval = 1;
#ifdef WIN32
setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<const char*>(&optval), sizeof(optval));
#else
setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<void*>(&optval), sizeof(optval)); setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<void*>(&optval), sizeof(optval));
#endif
// TODO: check optval or return value idk // TODO: check optval or return value idk
sockaddr_in addr {}; sockaddr_in addr {};
addr.sin_addr.s_addr = INADDR_ANY; addr.sin_addr.s_addr = INADDR_ANY;