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

Store the biome hash even if there are no chunks loaded yet.

Browse Source 
This avoids needless LOD regeneration on second join and removes some useless debug spam.
fixes #650
This commit is contained in:
IntegratedQuantum 2024-11-15 22:37:49 +01:00
parent f4133c3ab0
commit 8c35f9f736
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/terrain/SurfaceMap.zig
View File

@ -280,7 +280,9 @@ pub fn regenerateLOD(worldName: []const u8) !void { // MARK: regenerateLOD()
const dir = std.fmt.allocPrint(main.stackAllocator.allocator, "{}", .{lod}) catch unreachable; const dir = std.fmt.allocPrint(main.stackAllocator.allocator, "{}", .{lod}) catch unreachable;
defer main.stackAllocator.free(dir); defer main.stackAllocator.free(dir);
main.files.deleteDir(path, dir) catch |err| { main.files.deleteDir(path, dir) catch |err| {
std.log.err("Error while deleting directory {s}/{s}: {s}", .{path, dir, @errorName(err)}); if(err != error.FileNotFound) {
std.log.err("Error while deleting directory {s}/{s}: {s}", .{path, dir, @errorName(err)});
}
}; };
} }
// Find all the stored maps: // Find all the stored maps:

11
src/server/world.zig
View File

@ -663,7 +663,9 @@ pub const ServerWorld = struct { // MARK: ServerWorld
const dir = std.fmt.allocPrint(main.stackAllocator.allocator, "{}", .{lod}) catch unreachable; const dir = std.fmt.allocPrint(main.stackAllocator.allocator, "{}", .{lod}) catch unreachable;
defer main.stackAllocator.free(dir); defer main.stackAllocator.free(dir);
main.files.deleteDir(path, dir) catch |err| { main.files.deleteDir(path, dir) catch |err| {
std.log.err("Error while deleting directory {s}/{s}: {s}", .{path, dir, @errorName(err)}); if(err != error.FileNotFound) {
std.log.err("Error while deleting directory {s}/{s}: {s}", .{path, dir, @errorName(err)});
}
}; };
} }
// Find all the stored chunks: // Find all the stored chunks:
@ -671,8 +673,11 @@ pub const ServerWorld = struct { // MARK: ServerWorld
defer chunkPositions.deinit(); defer chunkPositions.deinit();
const path = std.fmt.allocPrint(main.stackAllocator.allocator, "saves/{s}/chunks/1", .{self.name}) catch unreachable; const path = std.fmt.allocPrint(main.stackAllocator.allocator, "saves/{s}/chunks/1", .{self.name}) catch unreachable;
defer main.stackAllocator.free(path); defer main.stackAllocator.free(path);
{ blk: {
var dirX = try std.fs.cwd().openDir(path, .{.iterate = true}); var dirX = std.fs.cwd().openDir(path, .{.iterate = true}) catch |err| {
if(err == error.FileNotFound) break :blk;
return err;
};
defer dirX.close(); defer dirX.close();
var iterX = dirX.iterate(); var iterX = dirX.iterate();
while(try iterX.next()) |entryX| { while(try iterX.next()) |entryX| {