Skip to content

Commit 4d04367

Browse files
authored
Fix server assets (for real this time) (#1889)
1 parent 267def1 commit 4d04367

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/game.zig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,9 @@ pub const World = struct { // MARK: World
678678
errdefer self.toolPalette.deinit();
679679
self.spawn = zon.get(Vec3f, "spawn", .{0, 0, 0});
680680

681-
try assets.loadWorldAssets("serverAssets", self.blockPalette, self.itemPalette, self.toolPalette, self.biomePalette);
681+
const path = std.fmt.allocPrint(main.stackAllocator.allocator, "{s}/serverAssets", .{main.files.cubyzDirStr()}) catch unreachable;
682+
defer main.stackAllocator.free(path);
683+
try assets.loadWorldAssets(path, self.blockPalette, self.itemPalette, self.toolPalette, self.biomePalette);
682684
Player.id = zon.get(u32, "player_id", std.math.maxInt(u32));
683685
Player.inventory = Inventory.init(main.globalAllocator, Player.inventorySize, .normal, .{.playerInventory = Player.id}, .{});
684686
Player.loadFrom(zon.getChild("player"));

0 commit comments

Comments
 (0)