From ac4a944e447e982d375366a02c55e1874f231911 Mon Sep 17 00:00:00 2001 From: ksenonadv Date: Tue, 30 Dec 2025 15:00:18 +0200 Subject: [PATCH 1/2] sync RakNet. temp ban invalid clients --- Server/Components/LegacyNetwork/legacy_network_impl.cpp | 1 + lib/RakNet | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Server/Components/LegacyNetwork/legacy_network_impl.cpp b/Server/Components/LegacyNetwork/legacy_network_impl.cpp index f9fd16a35..3cbe91088 100644 --- a/Server/Components/LegacyNetwork/legacy_network_impl.cpp +++ b/Server/Components/LegacyNetwork/legacy_network_impl.cpp @@ -429,6 +429,7 @@ void RakNetLegacyNetwork::OnPlayerConnect(RakNet::RPCParameters* rpcParams, void network->core->logLn(LogLevel::Warning, "Invalid client connecting from %.*s", int(addressString.length()), addressString.data()); network->rakNetServer.Kick(rpcParams->sender); + network->rakNetServer.AddToBanList(addressString.data(), 15'000u); return; } diff --git a/lib/RakNet b/lib/RakNet index 417077754..f1d225dbc 160000 --- a/lib/RakNet +++ b/lib/RakNet @@ -1 +1 @@ -Subproject commit 417077754bed5c23c38d64fb39c5a629790c091b +Subproject commit f1d225dbcbdd0cff32eb535d94317ebcff81abed From 21346be92526ae33a24206781c244adbf62f8292 Mon Sep 17 00:00:00 2001 From: ksenonadv Date: Tue, 30 Dec 2025 15:03:54 +0200 Subject: [PATCH 2/2] NPC component: nullptr check --- Server/Components/NPCs/npcs_impl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Server/Components/NPCs/npcs_impl.cpp b/Server/Components/NPCs/npcs_impl.cpp index 43a7c7160..7364d9f28 100644 --- a/Server/Components/NPCs/npcs_impl.cpp +++ b/Server/Components/NPCs/npcs_impl.cpp @@ -27,8 +27,11 @@ void NPCComponent::onInit(IComponentList* components) objects = components->queryComponent(); actors = components->queryComponent(); - vehicles->getPoolEventDispatcher().addEventHandler(this); - vehicles->getEventDispatcher().addEventHandler(this); + if (vehicles != nullptr) + { + vehicles->getPoolEventDispatcher().addEventHandler(this); + vehicles->getEventDispatcher().addEventHandler(this); + } } }