Skip to content

Commit 6063236

Browse files
committed
fix: always apply render distance (regression)
1 parent 6c1a238 commit 6063236

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

src/createLocalServer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import serverOptions from './defaultLocalServerOptions'
44
import { LocalServer } from './customServer'
55

66
export const startLocalServer = () => {
7-
const server = mcServer.createMCServer({ ...serverOptions, Server: LocalServer })
7+
const passOptions = { ...serverOptions, Server: LocalServer }
8+
const server = mcServer.createMCServer(passOptions)
89
server.formatMessage = (message) => `[server] ${message}`
9-
server.options = serverOptions
10+
server.options = passOptions
1011
return server
1112
}
1213

src/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import './controls'
3131
import './dragndrop'
3232
import './browserfs'
3333
import './eruda'
34+
import './watchOptions'
3435
import downloadAndOpenFile from './downloadAndOpenFile'
3536

3637
import net from 'net'
@@ -63,7 +64,8 @@ import {
6364
isCypress,
6465
loadScript,
6566
toMajorVersion,
66-
setLoadingScreenStatus
67+
setLoadingScreenStatus,
68+
setRenderDistance
6769
} from './utils'
6870

6971
import {
@@ -400,6 +402,7 @@ async function connect(connectOptions: {
400402
let localServer
401403
try {
402404
Object.assign(serverOptions, _.defaultsDeep({}, connectOptions.serverOverrides ?? {}, options.localServerOptions, serverOptions))
405+
serverOptions['view-distance'] = renderDistance
403406
const downloadMcData = async (version) => {
404407
setLoadingScreenStatus(`Downloading data for ${version}`)
405408
try {
@@ -533,6 +536,8 @@ async function connect(connectOptions: {
533536
const center = bot.entity.position
534537

535538
const worldView: import('../prismarine-viewer/viewer/lib/worldView').WorldView = new WorldView(bot.world, singeplayer ? renderDistance : Math.min(renderDistance, maxMultiplayerRenderDistance), center)
539+
window.worldView = worldView
540+
setRenderDistance()
536541

537542
let fovSetting = optionsScrn.fov
538543
const updateFov = () => {
@@ -564,7 +569,6 @@ async function connect(connectOptions: {
564569

565570
window.viewer = viewer
566571
window.loadedData = mcData
567-
window.worldView = worldView
568572
window.bot = bot
569573
window.Vec3 = Vec3
570574
window.pathfinder = pathfinder

src/utils.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,19 @@ export const toMajorVersion = (version) => {
197197
}
198198

199199
let prevRenderDistance = options.renderDistance
200-
export const reloadChunks = () => {
201-
if (!worldView || !localServer) return
202-
localServer.options['view-distance'] = options.renderDistance
200+
export const setRenderDistance = () => {
203201
worldView.viewDistance = options.renderDistance
204-
localServer.players[0].emit('playerChangeRenderDistance', options.renderDistance)
205-
worldView.updatePosition(bot.entity.position, true)
202+
if (localServer) {
203+
localServer.options['view-distance'] = options.renderDistance
204+
localServer.players[0].emit('playerChangeRenderDistance', options.renderDistance)
205+
}
206206
prevRenderDistance = options.renderDistance
207207
}
208+
export const reloadChunks = () => {
209+
if (!worldView) return
210+
setRenderDistance()
211+
worldView.updatePosition(bot.entity.position, true)
212+
}
208213

209214
export const openFilePicker = (specificCase?: 'resourcepack') => {
210215
// create and show input picker

0 commit comments

Comments
 (0)