Merge object id reserve (mr-529)

506b180 - fix(server): object id reserve

code/components/citizen-server-impl/include/state/ServerGameState.h

@@ -1197,7 +1197,6 @@ struct GameStateClientData
 {
 	rl::MessageBuffer ackBuffer{ 16384 };
 	std::unordered_set<int> objectIds;
-	std::unordered_set<int> reservedObjectIds;
 
 	std::mutex selfMutex;
 

code/components/citizen-server-impl/src/state/ServerGameState.cpp

@@ -3198,9 +3198,6 @@ void ServerGameState::FinalizeClone(const fx::ClientSharedPtr& client, const fx:
 					{
 						auto [lock, clientData] = GetClientData(this, clientRef);
 						clientData->objectIds.erase(objectId);
-
-						// erase reserved object id from client, because the object got removed
-						clientData->reservedObjectIds.erase(objectId);
 					}
 				}
 
@@ -3302,9 +3299,6 @@ bool ServerGameState::ProcessClonePacket(const fx::ClientSharedPtr& client, rl::
 		auto [lock, data] = GetClientData(this, client);
 		data->playerId = playerId;
 		timestamp = data->syncTs;
-
-		// indicate that the reserved object id was used
-		data->reservedObjectIds.erase(objectId);
 	}
 
 	std::vector<uint8_t> bitBytes(length);
@@ -3939,20 +3933,7 @@ void ServerGameState::GetFreeObjectIds(const fx::ClientSharedPtr& client, uint8_
 {
 	auto [lock, data] = GetClientData(this, client);
 	std::unique_lock objectIdsLock(m_objectIdsMutex);
-
-	// prevent requesting in sum more than double the amount of object ids that a single request can hold
-    // this allows reserving 64 in normal mode and 12 in big mode
-    if (data->reservedObjectIds.size() >= numIds * 2)
-    {
-	    // empty response is required, because client has g_requestedIds set to false
-    	// and will never request new ids again until a response is received
-    	net::Buffer outBuffer;
-    	outBuffer.Write<uint32_t>(HashRageString("msgObjectIds"));
-    	outBuffer.Write<uint16_t>(0);
-    	client->SendPacket(1, outBuffer, NetPacketType_Reliable);
-    	return;
-    }
-
+
 	uint16_t id = 1;
 
 	for (uint8_t i = 0; i < numIds; i++)
@@ -3964,9 +3945,8 @@ void ServerGameState::GetFreeObjectIds(const fx::ClientSharedPtr& client, uint8_
 			if (!m_objectIdsSent.test(id) && !m_objectIdsUsed.test(id))
 			{
 				hadId = true;
-				
+
 				data->objectIds.insert(id);
-				data->reservedObjectIds.insert(id);
 				freeIds.push_back(id);
 				m_objectIdsSent.set(id);