From 1fbf5618b9985822b631e0bac864f141e810dc22 Mon Sep 17 00:00:00 2001 From: IntegratedQuantum Date: Sun, 11 May 2025 19:54:25 +0200 Subject: [PATCH] Set the placeholder biome before receiving the first biome packet from the server fixes #1428 --- src/game.zig | 4 ++-- src/server/server.zig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game.zig b/src/game.zig index 6250c8cb..8e35f75e 100644 --- a/src/game.zig +++ b/src/game.zig @@ -673,8 +673,6 @@ pub const World = struct { // MARK: World main.blocks.meshes.generateTextureArray(); main.models.uploadModels(); - self.playerBiome = .init(main.server.terrain.biomes.getPlaceholderBiome()); - main.audio.setMusic(self.playerBiome.raw.preferredMusic); } pub fn deinit(self: *World) void { @@ -719,6 +717,8 @@ pub const World = struct { // MARK: World Player.id = zon.get(u32, "player_id", std.math.maxInt(u32)); Player.inventory = Inventory.init(main.globalAllocator, 32, .normal, .{.playerInventory = Player.id}); Player.loadFrom(zon.getChild("player")); + self.playerBiome = .init(main.server.terrain.biomes.getPlaceholderBiome()); + main.audio.setMusic(self.playerBiome.raw.preferredMusic); } pub fn update(self: *World) void { diff --git a/src/server/server.zig b/src/server/server.zig index 494b2483..76b1bd6f 100644 --- a/src/server/server.zig +++ b/src/server/server.zig @@ -410,7 +410,7 @@ fn update() void { // MARK: update() for(userList) |user| { const pos = @as(Vec3i, @intFromFloat(user.player.pos)); - const biomeId = world.?.getBiome(user.lastPos[0], pos[1], pos[2]).paletteId; + const biomeId = world.?.getBiome(pos[0], pos[1], pos[2]).paletteId; if(biomeId != user.lastSentBiomeId) { user.lastSentBiomeId = biomeId; main.network.Protocols.genericUpdate.sendBiome(user.conn, biomeId);