tweak(server): move msgNetGameEventV2 for compatibility to sync thread

citizenfx · Oct 14, 2024 · 63dafc3 · 63dafc3
1 parent f6b8773
commit 63dafc3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/code/components/citizen-server-impl/include/packethandlers/NetGameEventPacketHandler.h b/code/components/citizen-server-impl/include/packethandlers/NetGameEventPacketHandler.h
@@ -16,8 +16,10 @@ class NetGameEventPacketHandlerV2
 	}
 
 	static void COMPONENT_EXPORT(CITIZEN_SERVER_IMPL) RouteEvent(const fwRefContainer<fx::ServerGameStatePublic>& sgs, uint32_t bucket, const std::vector<uint16_t>& targetPlayers, const fwRefContainer<fx::ClientRegistry>& clientRegistry, const net::Buffer& data);
-	
+
 	void COMPONENT_EXPORT(CITIZEN_SERVER_IMPL) Handle(fx::ServerInstanceBase* instance, const fx::ClientSharedPtr& client, net::Buffer& packet);
+
+	static void COMPONENT_EXPORT(CITIZEN_SERVER_IMPL) HandleNetEvent(fx::ServerInstanceBase* instance, const fx::ClientSharedPtr& client, const net::Buffer& packet);
 
 	static constexpr const char* GetPacketId()
 	{

diff --git a/code/components/citizen-server-impl/src/packethandlers/NetGameEventPacketHandler.cpp b/code/components/citizen-server-impl/src/packethandlers/NetGameEventPacketHandler.cpp
@@ -31,7 +31,15 @@ void NetGameEventPacketHandlerV2::RouteEvent(const fwRefContainer<fx::ServerGame
 	}
 }
 
-void NetGameEventPacketHandlerV2::Handle(fx::ServerInstanceBase* instance, const fx::ClientSharedPtr& client, net::Buffer& buffer)
+void NetGameEventPacketHandlerV2::Handle(fx::ServerInstanceBase* instance, const fx::ClientSharedPtr& client, net::Buffer& packet)
+{
+	gscomms_execute_callback_on_sync_thread([instance, client, packet = std::move(packet)]
+	{
+		HandleNetEvent(instance, client, packet);
+	});
+}
+
+void NetGameEventPacketHandlerV2::HandleNetEvent(fx::ServerInstanceBase* instance, const fx::ClientSharedPtr& client, const net::Buffer& buffer)
 {
 	static size_t kClientMaxPacketSize = net::SerializableComponent::GetMaxSize<net::packet::ClientNetGameEventV2>();
 	static size_t kServerMaxReplySize = net::SerializableComponent::GetMaxSize<net::packet::ServerNetGameEventV2Packet>();