@rpgjs/common 5.0.0-alpha.42 → 5.0.0-alpha.44

package/dist/index.js

@@ -10104,6 +10104,7 @@ class RpgCommonMap {
           kind: this.resolvePhysicsEntityKind(owner, entity.uuid)
         });
       }
+      this.unbindCharacterSignalSync(entity);
       this.physic.removeEntity(entity);
     }
     this.physic.getMovementManager().clearAll();
@@ -10410,6 +10411,7 @@ class RpgCommonMap {
     const existingEntity = this.physic.getEntityByUUID(owner.id);
     if (existingEntity) {
       existingEntity.owner = owner;
+      this.bindCharacterSignalSync(existingEntity, owner);
       this.updateCharacterHitbox(owner);
       return;
     }
@@ -10440,6 +10442,7 @@ class RpgCommonMap {
     const entity = this.physic.getEntityByUUID(owner.id);
     if (!entity) return;
     entity.owner = owner;
+    this.bindCharacterSignalSync(entity, owner);
     const hitbox = typeof owner.hitbox === "function" ? owner.hitbox() : owner.hitbox;
     const width = hitbox?.w ?? 32;
     const height = hitbox?.h ?? 32;
@@ -10461,6 +10464,50 @@ class RpgCommonMap {
     }
     return fallback;
   }
+  bindCharacterSignalSync(entity, owner) {
+    const entityAny = entity;
+    if (entityAny.__rpgSignalSyncOwner === owner && typeof entityAny.__rpgSignalSyncUnsubscribe === "function") {
+      return;
+    }
+    this.unbindCharacterSignalSync(entity);
+    entityAny.__rpgSignalSyncOwner = owner;
+    const subscriptions = [];
+    entityAny.__rpgSignalSyncUnsubscribe = () => {
+      subscriptions.forEach((subscription) => subscription.unsubscribe());
+      delete entityAny.__rpgSignalSyncUnsubscribe;
+      delete entityAny.__rpgSignalSyncOwner;
+    };
+    const syncFromSignals = () => {
+      if (this.isPhysicsSyncingSignals) {
+        return;
+      }
+      const currentOwner = entityAny.owner;
+      if (!currentOwner?.id || currentOwner.id !== entity.uuid) {
+        return;
+      }
+      this.updateCharacterHitbox(currentOwner);
+    };
+    const subscribeSignal = (signalLike) => {
+      const observable = signalLike?.observable;
+      if (!observable || typeof observable.subscribe !== "function") {
+        return;
+      }
+      subscriptions.push(observable.subscribe(() => syncFromSignals()));
+    };
+    subscribeSignal(owner.x);
+    subscribeSignal(owner.y);
+    subscribeSignal(owner.hitbox);
+    subscribeSignal(owner._through);
+  }
+  unbindCharacterSignalSync(entity) {
+    const entityAny = entity;
+    const unsubscribe = entityAny.__rpgSignalSyncUnsubscribe;
+    if (typeof unsubscribe === "function") {
+      unsubscribe();
+      return;
+    }
+    delete entityAny.__rpgSignalSyncOwner;
+  }
   shouldDisableCharacterCollisions(owner) {
     if (typeof owner._through === "function") {
       try {
@@ -10822,6 +10869,7 @@ class RpgCommonMap {
       entity.unfreeze();
     }
     entity.owner = owner;
+    this.bindCharacterSignalSync(entity, owner);
     entity.onDirectionChange(({ cardinalDirection }) => {
       if (!("$send" in this)) return;
       const owner2 = entity.owner;
@@ -10863,14 +10911,16 @@ class RpgCommonMap {
       const topLeftX2 = x - entityWidth / 2;
       const topLeftY2 = y - entityHeight / 2;
       let changed = false;
-      if (typeof currentOwner.x === "function" && typeof currentOwner.x.set === "function") {
-        currentOwner.x.set(Math.round(topLeftX2));
-        changed = true;
-      }
-      if (typeof currentOwner.y === "function" && typeof currentOwner.y.set === "function") {
-        currentOwner.y.set(Math.round(topLeftY2));
-        changed = true;
-      }
+      this.withPhysicsSync(() => {
+        if (typeof currentOwner.x === "function" && typeof currentOwner.x.set === "function") {
+          currentOwner.x.set(Math.round(topLeftX2));
+          changed = true;
+        }
+        if (typeof currentOwner.y === "function" && typeof currentOwner.y.set === "function") {
+          currentOwner.y.set(Math.round(topLeftY2));
+          changed = true;
+        }
+      });
       if (changed) {
         currentOwner.applyFrames?.();
       }
@@ -10983,6 +11033,7 @@ class RpgCommonMap {
     if (!entity) {
       return false;
     }
+    this.unbindCharacterSignalSync(entity);
     const resolvedOwner = owner ?? entity.owner;
     if (resolvedOwner) {
       this.emitPhysicsEntityRemove({