Skip to content
This repository has been archived by the owner on Jun 10, 2022. It is now read-only.

Fix for grab sync. Fixes #538 #539

Merged
merged 1 commit into from
Apr 28, 2020
Merged

Fix for grab sync. Fixes #538 #539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/sdk/src/internal/adapters/multipeer/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);

Expand Down