Skip to content

Commit 620861a

Browse files
Fix linter
1 parent cdb3bf3 commit 620861a

File tree

5 files changed

+46
-35
lines changed

5 files changed

+46
-35
lines changed

src/client/networking/systems.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn receive_message_system(
2222
lib::NetworkingMessage::PlayerLeave(event) => {
2323
player_despawn_events
2424
.send(remote_player_events::RemotePlayerDespawnedEvent { client_id: event });
25-
}
25+
}
2626
lib::NetworkingMessage::BlockUpdate { position, block } => {
2727
debug!("Client received block update message: {:?}", position);
2828
block_update_events.send(terrain_events::BlockUpdateEvent {
@@ -64,7 +64,7 @@ pub fn receive_message_system(
6464
lib::NetworkingMessage::PlayerSync(event) => {
6565
player_sync_events
6666
.send(remote_player_events::RemotePlayerSyncEvent { players: event });
67-
}
67+
}
6868
_ => {
6969
warn!("Received unknown message type. (ReliableUnordered)");
7070
}

src/client/terrain/resources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ mod tests {
156156
let position = Vec3::new(0.0, 0.0, 0.0);
157157
let chunk = Chunk::new(position);
158158

159-
chunk_manager.set_chunk(position, chunk.clone());
159+
chunk_manager.set_chunk(position, chunk);
160160
let retrieved_chunk = chunk_manager.get_chunk(position).unwrap();
161161
assert_eq!(retrieved_chunk.position, chunk.position);
162162
}

src/client/terrain/systems.rs

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ pub fn setup_world_system(mut client: ResMut<RenetClient>) {
1616

1717
batched_positions.for_each(|batch| {
1818
let request_positions = batch.to_vec();
19-
info!("Sending chunk batch request for {:?}", request_positions.len());
19+
info!(
20+
"Sending chunk batch request for {:?}",
21+
request_positions.len()
22+
);
2023
let message = bincode::serialize(&NetworkingMessage::ChunkBatchRequest(request_positions));
2124
client.send_message(DefaultChannel::ReliableUnordered, message.unwrap());
2225
});
@@ -34,7 +37,10 @@ pub fn handle_chunk_mesh_update_events(
3437
texture_manager: ResMut<terrain_util::TextureManager>,
3538
) {
3639
for event in chunk_mesh_update_events.read() {
37-
info!("Received chunk mesh update event for chunk {:?}", event.position);
40+
info!(
41+
"Received chunk mesh update event for chunk {:?}",
42+
event.position
43+
);
3844
let chunk_option = chunk_manager.get_chunk(event.position);
3945
match chunk_option {
4046
Some(chunk) => {
@@ -119,18 +125,18 @@ fn spawn_chunk(
119125
);
120126

121127
commands.spawn((
122-
MaterialMeshBundle {
123-
mesh: meshes.add(mesh),
124-
transform,
125-
material,
126-
..default()
127-
},
128-
terrain_components::ChunkMesh {
129-
key: [
130-
chunk.position.x as i32,
131-
chunk.position.y as i32,
132-
chunk.position.z as i32,
133-
],
134-
},
128+
MaterialMeshBundle {
129+
mesh: meshes.add(mesh),
130+
transform,
131+
material,
132+
..default()
133+
},
134+
terrain_components::ChunkMesh {
135+
key: [
136+
chunk.position.x as i32,
137+
chunk.position.y as i32,
138+
chunk.position.z as i32,
139+
],
140+
},
135141
));
136142
}

src/server/networking/systems.rs

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,33 @@ pub fn receive_message_system(
3838
positions, client_id
3939
);
4040

41-
let chunks: Vec<Chunk> = positions.into_iter().map(|position| {
42-
let chunk = chunk_manager.get_chunk(position);
41+
let chunks: Vec<Chunk> = positions
42+
.into_iter()
43+
.map(|position| {
44+
let chunk = chunk_manager.get_chunk(position);
4345

44-
match chunk {
45-
Some(chunk) => {
46-
return chunk.clone();
47-
}
48-
None => {
49-
let mut chunk = lib::Chunk::new(position);
46+
match chunk {
47+
Some(chunk) => *chunk,
48+
None => {
49+
let mut chunk = lib::Chunk::new(position);
5050

51-
let generator = terrain_util::generator::Generator::new(0);
51+
let generator = terrain_util::generator::Generator::new(0);
5252

53-
generator.generate_chunk(&mut chunk);
53+
generator.generate_chunk(&mut chunk);
5454

55-
return chunk.clone();
55+
chunk
56+
}
5657
}
57-
}
58-
}).collect();
59-
60-
let message = bincode::serialize(&lib::NetworkingMessage::ChunkBatchResponse(chunks));
61-
server.send_message(client_id, DefaultChannel::ReliableUnordered, message.unwrap());
58+
})
59+
.collect();
6260

61+
let message =
62+
bincode::serialize(&lib::NetworkingMessage::ChunkBatchResponse(chunks));
63+
server.send_message(
64+
client_id,
65+
DefaultChannel::ReliableUnordered,
66+
message.unwrap(),
67+
);
6368
}
6469
_ => {
6570
warn!("Received unknown message type. (ReliableUnordered)");

src/server/terrain/resources.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ mod tests {
174174
let position = Vec3::new(0.0, 0.0, 0.0);
175175
let chunk = Chunk::new(position);
176176

177-
chunk_manager.set_chunk(position, chunk.clone());
177+
chunk_manager.set_chunk(position, chunk);
178178
let retrieved_chunk = chunk_manager.get_chunk(position).unwrap();
179179
assert_eq!(retrieved_chunk.position, chunk.position);
180180
}

0 commit comments

Comments
 (0)