Skip to content

Commit 709c66b

Browse files
authored
Fix/go to (#6127)
* remove goto condition for worlds * fix goto condition
1 parent f45bcfa commit 709c66b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

browser-interface/packages/shared/chat/sagas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function initChatCommands() {
216216

217217
if (isValidPosition) {
218218
const { x, y } = coordinates
219-
TeleportController.goTo(x, y).then(
219+
TeleportController.goTo(x, y, false).then(
220220
({ message }) => notifyStatusThroughChat(message),
221221
() => {
222222
// Do nothing. This is handled inside controller

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import defaultLogger from 'lib/logger'
66
import { gridToWorld } from 'lib/decentraland/parcels/gridToWorld'
77

88
import { store } from 'shared/store/isolatedStore'
9-
import { getRealmAdapter, isWorldLoaderActive } from 'shared/realm/selectors'
9+
import { getRealmAdapter } from 'shared/realm/selectors'
1010
import { Parcel } from 'shared/dao/types'
1111
import { urlWithProtocol } from 'shared/realm/resolver'
1212
import { trackTeleportTriggered } from 'shared/loading/types'
@@ -17,7 +17,6 @@ import { lastPlayerPosition } from 'shared/world/positionThings'
1717
import { homePointKey } from 'shared/atlas/utils'
1818
import { getFromPersistentStorage } from 'lib/browser/persistentStorage'
1919
import { changeToMostPopulatedRealm } from '../dao'
20-
import { ensureRealmAdapter } from '../realm/ensureRealmAdapter'
2120

2221
const descriptiveValidWorldRanges = getWorld()
2322
.validWorldRanges.map((range) => `(X from ${range.xMin} to ${range.xMax}, and Y from ${range.yMin} to ${range.yMax})`)
@@ -95,12 +94,10 @@ export class TeleportController {
9594
teleportMessage?: string
9695
): Promise<{ message: string; success: boolean }> {
9796
const tpMessage: string = teleportMessage ? teleportMessage : `Teleporting to ${x}, ${y}...`
98-
const realmAdapter = await ensureRealmAdapter()
99-
const isWorld = isWorldLoaderActive(realmAdapter)
10097

10198
if (isInsideWorldLimits(x, y)) {
10299
try {
103-
if (goToMostPopulatedRealm && !isWorld) await changeToMostPopulatedRealm()
100+
if (goToMostPopulatedRealm) await changeToMostPopulatedRealm()
104101

105102
store.dispatch(trackTeleportTriggered(tpMessage))
106103
store.dispatch(teleportToAction({ position: gridToWorld(x, y) }))

0 commit comments

Comments
 (0)