AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 19:28:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
Krzysztof Wiśniewski 2025-07-26 10:25:16 +02:00 committed by GitHub
parent 67261a4060
commit 43cc33d483
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/world.zig
View File

@ -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"}); 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; const old = playerData.object.fetchPut(key, .{.stringOwned = base64Data}) catch unreachable orelse unreachable;
old.value.deinit(main.stackAllocator); 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); 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); var writer = main.utils.BinaryWriter.init(main.stackAllocator);
defer writer.deinit(); defer writer.deinit();
@ -1000,11 +1000,11 @@ pub const ServerWorld = struct { // MARK: ServerWorld
main.items.Inventory.Sync.ServerSide.mutex.lock(); main.items.Inventory.Sync.ServerSide.mutex.lock();
defer main.items.Inventory.Sync.ServerSide.mutex.unlock(); defer main.items.Inventory.Sync.ServerSide.mutex.unlock();
if(main.items.Inventory.Sync.ServerSide.getInventoryFromSource(.{.playerInventory = user.id})) |inv| { 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."); } else @panic("The player inventory wasn't found. Cannot save player data.");
if(main.items.Inventory.Sync.ServerSide.getInventoryFromSource(.{.hand = user.id})) |inv| { 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."); } else @panic("The player hand inventory wasn't found. Cannot save player data.");
} }