fix: goto & position param in worlds (#6115)

Author: gonpombo8

browser-interface/packages/shared/scene-loader/sagas.ts

@@ -135,15 +135,13 @@ function* teleportHandler(action: TeleportToAction) {
   try {
     // look for the target scene
     const pointer = encodeParcelPosition(worldToGrid(action.payload.position))
-    const command: SetDesiredScenesCommand = yield apply(sceneLoader, sceneLoader.fetchScenesByLocation, [[pointer]])
-
+    const command: SetDesiredScenesCommand = yield call(sceneLoader.fetchScenesByLocation, [pointer])
     // is a target scene, then it will be used to settle the position
     if (command && command.scenes && command.scenes.length) {
       // pick always the first scene to unsettle the position once loaded
       const settlerScene = command.scenes[0].id
 
       const scene: SceneWorker | undefined = yield call(getSceneWorkerBySceneID, settlerScene)
-
       const spawnPoint =
         pickWorldSpawnpoint(
           scene?.metadata || command.scenes[0].entity.metadata,

browser-interface/packages/shared/scene-loader/world-loader-impl/index.ts

@@ -31,8 +31,32 @@ export async function createWorldLoader(options: { urns: string[] }): Promise<IS
   const emptyParcelController = new EmptyParcelController({ rootUrl: getResourcesURL('.') })
 
   return {
-    async fetchScenesByLocation(_parcels) {
-      return { scenes }
+    async fetchScenesByLocation(parcels) {
+      // If the world has only one scene, return always that scene.
+      if (scenes.length === 1) {
+        return { scenes }
+      }
+
+      // Worlds with more than one scene deployed.
+      const newScenes = new Set<LoadableScene>()
+      // First add the scenes based on the location (parcels)
+      // If there is no scene, add an empty scene.
+      for (const parcel of parcels) {
+        const scene = mappingScene.get(parcel)
+        if (scene) {
+          newScenes.add(scene)
+        } else {
+          const scene = await emptyParcelController.createFakeEntity(parcel)
+
+          mappingScene.set(parcel, scene)
+          newScenes.add(scene)
+        }
+      }
+      // Add the rest of the scenes.
+      for (const [_, scene] of mappingScene) {
+        newScenes.add(scene)
+      }
+      return { scenes: [...newScenes] }
     },
     async reportPosition(positionReport) {
       const newScenes: Set<LoadableScene> = new Set()

browser-interface/packages/shared/world/TeleportController.ts

@@ -6,7 +6,7 @@ import defaultLogger from 'lib/logger'
 import { gridToWorld } from 'lib/decentraland/parcels/gridToWorld'
 
 import { store } from 'shared/store/isolatedStore'
-import { getRealmAdapter } from 'shared/realm/selectors'
+import { getRealmAdapter, isWorldLoaderActive } from 'shared/realm/selectors'
 import { Parcel } from 'shared/dao/types'
 import { urlWithProtocol } from 'shared/realm/resolver'
 import { trackTeleportTriggered } from 'shared/loading/types'
@@ -17,6 +17,7 @@ import { lastPlayerPosition } from 'shared/world/positionThings'
 import { homePointKey } from 'shared/atlas/utils'
 import { getFromPersistentStorage } from 'lib/browser/persistentStorage'
 import { changeToMostPopulatedRealm } from '../dao'
+import { ensureRealmAdapter } from '../realm/ensureRealmAdapter'
 
 const descriptiveValidWorldRanges = getWorld()
   .validWorldRanges.map((range) => `(X from ${range.xMin} to ${range.xMax}, and Y from ${range.yMin} to ${range.yMax})`)
@@ -94,9 +95,12 @@ export class TeleportController {
     teleportMessage?: string
   ): Promise<{ message: string; success: boolean }> {
     const tpMessage: string = teleportMessage ? teleportMessage : `Teleporting to ${x}, ${y}...`
+    const realmAdapter = await ensureRealmAdapter()
+    const isWorld = isWorldLoaderActive(realmAdapter)
+
     if (isInsideWorldLimits(x, y)) {
       try {
-        if (goToMostPopulatedRealm) await changeToMostPopulatedRealm()
+        if (goToMostPopulatedRealm && !isWorld) await changeToMostPopulatedRealm()
 
         store.dispatch(trackTeleportTriggered(tpMessage))
         store.dispatch(teleportToAction({ position: gridToWorld(x, y) }))