cloning: another check for 'our object'

blattersturm · blattersturm · commit 0b3915618c6c · 2019-07-02T20:41:11.000+02:00
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__);
 

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,9 @@ bool CloneManagerLocal::HandleCloneUpdate(const msgClone& msg)`
`904`	`904`	`auto& extData = m_extendedData[msg.GetObjectId()];`
`905`	`905`	`auto obj = objIt->second;`
`906`	`906`
`907`		`- if (extData.clientId == m_netLibrary->GetServerNetID())`
	`907`	`+ // if owned locally`
	`908`	`+ if (msg.GetClientId() == m_netLibrary->GetServerNetID()`
	`909`	`+ && extData.clientId == msg.GetClientId() /* and this is not a migration */)`
`908`	`910`	`{`
`909`	`911`	`Log("%s: our object, bailing out\n", __func__);`
`910`	`912`