neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-06 01:54:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

io/region: remove count variable from Region::foreach_chunk()

Browse source
This commit is contained in:
Matthias Schiffer 2023-01-25 21:47:17 +01:00
parent 5e96be3fda
commit 0d8b989c10
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/io/region.rs
View file

@ -89,7 +89,7 @@ impl<R: Read + Seek> Region<R> {
{ {
let Region { mut reader } = self; let Region { mut reader } = self;
let chunk_map = { let mut chunk_map = {
let mut header = [0u8; BLOCKSIZE]; let mut header = [0u8; BLOCKSIZE];
reader reader
.read_exact(&mut header) .read_exact(&mut header)
@ -99,11 +99,10 @@ impl<R: Read + Seek> Region<R> {
}; };
let mut index = 1; let mut index = 1;
let mut count = 0;
let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize]; let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
while count < chunk_map.len() { while !chunk_map.is_empty() {
let Some(&ChunkDesc { x, z, len }) = chunk_map.get(&index) else { let Some(ChunkDesc { x, z, len }) = chunk_map.remove(&index) else {
reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?; reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
index += 1; index += 1;
continue; continue;
@ -113,9 +112,7 @@ impl<R: Read + Seek> Region<R> {
if *chunk_seen { if *chunk_seen {
bail!("Duplicate chunk"); bail!("Duplicate chunk");
} }
*chunk_seen = true; *chunk_seen = true;
count += 1;
let mut buffer = vec![0; (len as usize) * BLOCKSIZE]; let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
reader reader