Skip to content

Commit c48be7a

Browse files
Fix linter, attempt fix max memory
1 parent dc7cb04 commit c48be7a

File tree

3 files changed

+37
-6
lines changed

3 files changed

+37
-6
lines changed

src/client/networking/systems.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn receive_message_system(
2121
lib::NetworkingMessage::PlayerLeave(event) => {
2222
player_despawn_events
2323
.send(remote_player_events::RemotePlayerDespawnedEvent { client_id: event });
24-
}
24+
}
2525
lib::NetworkingMessage::BlockUpdate { position, block } => {
2626
debug!("Client received block update message: {:?}", position);
2727
block_update_events.send(terrain_events::BlockUpdateEvent {
@@ -48,13 +48,16 @@ pub fn receive_message_system(
4848
debug!("Received message: {:?}", message);
4949
match message {
5050
lib::NetworkingMessage::ChunkResponse(chunk) => {
51-
debug!("Client received chunk response message for: {:?}", chunk.position);
51+
debug!(
52+
"Client received chunk response message for: {:?}",
53+
chunk.position
54+
);
5255
chunk_manager.insert_chunk(chunk);
5356
}
5457
lib::NetworkingMessage::PlayerSync(event) => {
5558
player_sync_events
5659
.send(remote_player_events::RemotePlayerSyncEvent { players: event });
57-
}
60+
}
5861
_ => {
5962
warn!("Received unknown message type. (ReliableUnordered)");
6063
}

src/client/terrain/resources.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ impl ChunkManager {
9797
);
9898
let local_position = (position - chunk_position).floor();
9999
Some(chunk.get(
100-
local_position.x as usize,
101-
local_position.y as usize,
102-
local_position.z as usize,
100+
local_position.x as usize,
101+
local_position.y as usize,
102+
local_position.z as usize,
103103
))
104104
}
105105
None => {

src/server/networking/mod.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::time::Duration;
2+
13
pub mod systems;
24

35
use crate::prelude::*;
@@ -28,6 +30,32 @@ impl Plugin for NetworkingPlugin {
2830
let transport = NetcodeServerTransport::new(server_config, socket).unwrap();
2931
app.insert_resource(transport);
3032

33+
let send_type_unreliable = SendType::Unreliable;
34+
let send_type_reliable_ordered = SendType::ReliableOrdered {
35+
resend_time: Duration::from_millis(300),
36+
};
37+
let send_type_reliable_unordered = SendType::ReliableUnordered {
38+
resend_time: Duration::from_millis(300),
39+
};
40+
41+
let channel_config_unreliable = ChannelConfig {
42+
channel_id: 0,
43+
max_memory_usage_bytes: 5 * 1024 * 1024, // 5 megabytes
44+
send_type: send_type_unreliable,
45+
};
46+
47+
let channel_config_reliable_ordered = ChannelConfig {
48+
channel_id: 1,
49+
max_memory_usage_bytes: 5 * 1024 * 1024, // 5 megabytes
50+
send_type: send_type_reliable_ordered,
51+
};
52+
53+
let channel_config_reliable_unordered = ChannelConfig {
54+
channel_id: 2,
55+
max_memory_usage_bytes: 5 * 1024 * 1024, // 5 megabytes
56+
send_type: send_type_reliable_unordered,
57+
};
58+
3159
app.add_systems(Update, networking_systems::receive_message_system);
3260
app.add_systems(Update, networking_systems::handle_events_system);
3361
}

0 commit comments

Comments
 (0)