From 43cc33d4836bdd208f53f80846d652bd75d59eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Wi=C5=9Bniewski?= Date: Sat, 26 Jul 2025 10:25:16 +0200 Subject: [PATCH] Apply suggestions from code review --- src/server/world.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/server/world.zig b/src/server/world.zig index 4ae5a096..245f21f6 100644 --- a/src/server/world.zig +++ b/src/server/world.zig @@ -594,7 +594,7 @@ pub const ServerWorld = struct { // MARK: ServerWorld std.log.debug("Item #{}: {} x {s}", .{i, stack.amount, if(stack.item) |item| item.id() else "null"}); } - const base64Data = savePlayerInventory(temp, main.stackAllocator); + const base64Data = savePlayerInventory(main.stackAllocator, temp); const old = playerData.object.fetchPut(key, .{.stringOwned = base64Data}) catch unreachable orelse unreachable; old.value.deinit(main.stackAllocator); }, @@ -965,7 +965,7 @@ pub const ServerWorld = struct { // MARK: ServerWorld return main.items.Inventory.Sync.ServerSide.createExternallyManagedInventory(size, .normal, source, &reader); } - fn savePlayerInventory(inv: main.items.Inventory, allocator: NeverFailingAllocator) []const u8 { + fn savePlayerInventory(allocator: NeverFailingAllocator, inv: main.items.Inventory) []const u8 { var writer = main.utils.BinaryWriter.init(main.stackAllocator); defer writer.deinit(); @@ -1000,11 +1000,11 @@ pub const ServerWorld = struct { // MARK: ServerWorld main.items.Inventory.Sync.ServerSide.mutex.lock(); defer main.items.Inventory.Sync.ServerSide.mutex.unlock(); if(main.items.Inventory.Sync.ServerSide.getInventoryFromSource(.{.playerInventory = user.id})) |inv| { - playerZon.put("playerInventory", ZonElement{.stringOwned = savePlayerInventory(inv, main.stackAllocator)}); + playerZon.put("playerInventory", ZonElement{.stringOwned = savePlayerInventory(main.stackAllocator, inv)}); } else @panic("The player inventory wasn't found. Cannot save player data."); if(main.items.Inventory.Sync.ServerSide.getInventoryFromSource(.{.hand = user.id})) |inv| { - playerZon.put("hand", ZonElement{.stringOwned = savePlayerInventory(inv, main.stackAllocator)}); + playerZon.put("hand", ZonElement{.stringOwned = savePlayerInventory(main.stackAllocator, inv)}); } else @panic("The player hand inventory wasn't found. Cannot save player data."); }