cloning: another check for 'our object'

citizenfx · Jul 2, 2019 · 0b39156 · 0b39156
1 parent 6802db8
commit 0b39156
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/code/components/gta-net-five/src/CloneManager.cpp b/code/components/gta-net-five/src/CloneManager.cpp
@@ -904,7 +904,9 @@ bool CloneManagerLocal::HandleCloneUpdate(const msgClone& msg)
 	auto& extData = m_extendedData[msg.GetObjectId()];
 	auto obj = objIt->second;
 
-	if (extData.clientId == m_netLibrary->GetServerNetID())
+	// if owned locally
+	if (msg.GetClientId() == m_netLibrary->GetServerNetID()
+		&& extData.clientId == msg.GetClientId() /* and this is not a migration */)
 	{
 		Log("%s: our object, bailing out\n", __func__);