Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Temporary networking issue fix

See merge request veloren/veloren!116

Former-commit-id: d733d6e7f57f83d48f3cce211b81be42aa25b5fa
This commit is contained in:
Joshua Barretto 2019-05-09 18:39:30 +00:00
commit 6eba4e6afa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/lib.rs
View File

@ -212,12 +212,13 @@ impl Client {
} }
// Request chunks from the server // Request chunks from the server
for i in chunk_pos.x - 3..chunk_pos.x + 4 { for i in chunk_pos.x - 4..chunk_pos.x + 5 {
for j in chunk_pos.y - 3..chunk_pos.y + 4 { for j in chunk_pos.y - 4..chunk_pos.y + 5 {
for k in 0..2 { for k in 0..2 {
let key = Vec3::new(i, j, k); let key = Vec3::new(i, j, k);
if self.state.terrain().get_key(key).is_none() if self.state.terrain().get_key(key).is_none()
&& !self.pending_chunks.contains(&key) && !self.pending_chunks.contains(&key)
&& self.pending_chunks.len() < 4
{ {
self.postbox self.postbox
.send_message(ClientMsg::TerrainChunkRequest { key }); .send_message(ClientMsg::TerrainChunkRequest { key });

4
server/src/lib.rs
View File

@ -202,7 +202,7 @@ impl Server {
.map(|e: i32| e.abs()) .map(|e: i32| e.abs())
.reduce_max(); .reduce_max();
if dist < 5 { if dist < 7 {
self.clients.notify( self.clients.notify(
entity, entity,
ServerMsg::TerrainChunkUpdate { ServerMsg::TerrainChunkUpdate {
@ -234,7 +234,7 @@ impl Server {
min_dist = min_dist.min(dist); min_dist = min_dist.min(dist);
} }
if min_dist > 5 { if min_dist > 7 {
chunks_to_remove.push(key); chunks_to_remove.push(key);
} }
}); });