diff --git a/include/TUDPServer.h b/include/TUDPServer.h index c79bb2b..abe75b0 100644 --- a/include/TUDPServer.h +++ b/include/TUDPServer.h @@ -10,7 +10,7 @@ class TUDPServer : public IThreaded { public: explicit TUDPServer(TServer& Server, TPPSMonitor& PPSMonitor, TTCPServer& TCPServer); - ~TUDPServer(); + //~TUDPServer(); void operator()() override; diff --git a/src/TTCPServer.cpp b/src/TTCPServer.cpp index 18c544b..6a013e6 100644 --- a/src/TTCPServer.cpp +++ b/src/TTCPServer.cpp @@ -545,12 +545,11 @@ void TTCPServer::SyncClient(const std::weak_ptr& c) { return; // Syncing, later set isSynced // after syncing is done, we apply all packets they missed - std::this_thread::sleep_for(std::chrono::seconds(1)); Respond(*LockedClient, ("Sn") + LockedClient->GetName(), true); + LockedClient->SetIsSyncing(true); UDPServer().SendToAll(LockedClient.get(), ("JWelcome ") + LockedClient->GetName() + "!", false, true); TriggerLuaEvent(("onPlayerJoin"), false, nullptr, std::make_unique(TLuaArg { { LockedClient->GetID() } }), false); bool Return = false; - LockedClient->SetIsSyncing(true); mServer.ForEachClient([&](const std::weak_ptr& ClientPtr) -> bool { if (!ClientPtr.expired()) { auto client = ClientPtr.lock(); diff --git a/src/TUDPServer.cpp b/src/TUDPServer.cpp index 2326496..af6e79e 100644 --- a/src/TUDPServer.cpp +++ b/src/TUDPServer.cpp @@ -178,5 +178,5 @@ std::string TUDPServer::UDPRcvFromClient(sockaddr_in& client) const { return std::string(Ret.begin(), Ret.begin() + Rcv); } -TUDPServer::~TUDPServer() { -} +/*TUDPServer::~TUDPServer() { +}*/