Skip to content

fix using the cubyzDir two times #3051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Wunka wants to merge 2 commits into from
Closed

fix using the cubyzDir two times #3051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b8eba
fix using the cubyzDir double
Wunka May 7, 2026
bb6b209
server assets are doubly too
Wunka May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion src/server/world.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Loading