diff --git a/src/game.zig b/src/game.zig index bfa801d5eb..2fe04559cc 100644 --- a/src/game.zig +++ b/src/game.zig @@ -361,7 +361,7 @@ pub const World = struct { // MARK: World self.entityComponentPalette = try assets.Palette.init(main.globalAllocator, zon.getChild("entityComponentPalette"), null); errdefer self.entityComponentPalette.deinit(); - const path = std.fmt.allocPrint(main.stackAllocator.allocator, "{s}/serverAssets", .{main.files.cubyzDirStr()}) catch unreachable; + const path = std.fmt.allocPrint(main.stackAllocator.allocator, "serverAssets", .{}) catch unreachable; defer main.stackAllocator.free(path); try assets.loadWorldAssets(path, self.blockPalette, self.itemPalette, self.proceduralItemPalette, self.biomePalette, self.entityModelPalette, self.entityComponentPalette); Player.id = zon.get(u32, "player_id", std.math.maxInt(u32)); diff --git a/src/server/world.zig b/src/server/world.zig index 4b129b3d2c..ea4d2e8a88 100644 --- a/src/server/world.zig +++ b/src/server/world.zig @@ -508,7 +508,7 @@ pub const ServerWorld = struct { // MARK: ServerWorld try self.loadWorldConfig(arena, dir, worldData); try self.loadPlayerLoginInfo(dir); - try main.assets.loadWorldAssets(try std.fmt.allocPrint(arena.allocator, "{s}/saves/{s}/assets/", .{files.cubyzDirStr(), path}), self.blockPalette, self.itemPalette, self.proceduralItemPalette, self.biomePalette, self.entityModelPalette, self.entityComponentPalette); + try main.assets.loadWorldAssets(try std.fmt.allocPrint(arena.allocator, "saves/{s}/assets/", .{path}), self.blockPalette, self.itemPalette, self.proceduralItemPalette, self.biomePalette, self.entityModelPalette, self.entityComponentPalette); // Store the block palette now that everything is loaded. try dir.writeZon("palette.zig.zon", self.blockPalette.storeToZon(arena)); try dir.writeZon("item_palette.zig.zon", self.itemPalette.storeToZon(arena));