Fix for grab sync. Fixes #538

microsoft · Apr 28, 2020 · 22d5df1 · 22d5df1
1 parent 85a6969
commit 22d5df1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/sdk/src/internal/adapters/multipeer/rules.ts b/packages/sdk/src/internal/adapters/multipeer/rules.ts
@@ -305,7 +305,7 @@ export const Rules: { [id in Payloads.PayloadType]: Rule } = {
 				message: Message<Payloads.ActorCorrection>
 			) => {
 				const syncActor = session.actorSet.get(message.payload.actorId);
-				if (syncActor && (client.authoritative || syncActor.grabbedBy === client.id)) {
+				if (syncActor && ((client.authoritative && !syncActor.grabbedBy) || (syncActor.grabbedBy === client.id))) {
 					const correctionPayload = message.payload;
 
 					// Synthesize an actor update message and add in the transform from the correction payload.
@@ -399,7 +399,7 @@ export const Rules: { [id in Payloads.PayloadType]: Rule } = {
 				message: Message<Payloads.ActorUpdate>
 			) => {
 				const syncActor = session.actorSet.get(message.payload.actor.id);
-				if (syncActor && (client.authoritative || syncActor.grabbedBy === client.id)) {
+				if (syncActor && ((client.authoritative && !syncActor.grabbedBy) || (syncActor.grabbedBy === client.id))) {
 					// Merge the update into the existing actor.
 					session.cacheActorUpdateMessage(message);