From 0ae259f35965b06a85c0da04ab116c6b42c3b041 Mon Sep 17 00:00:00 2001
From: Avi Weinstock <aweinstock314@gmail.com>
Date: Tue, 20 Apr 2021 23:27:43 -0400
Subject: [PATCH] Cleanup errors introduced in rebase.
---
client/src/lib.rs | 2 +-
common/net/src/msg/server.rs | 2 +-
server/src/sys/msg/terrain.rs | 1 -
server/src/sys/terrain.rs | 2 +-
server/src/sys/terrain_sync.rs | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/client/src/lib.rs b/client/src/lib.rs
index d0108121fc..63168d9337 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -1924,7 +1924,7 @@ impl Client {
match msg {
ServerGeneral::TerrainChunkUpdate { key, chunk } => {
if let Some(chunk) = chunk.ok().and_then(|c| c.decompress()) {
- self.state.insert_chunk(key, chunk);
+ self.state.insert_chunk(key, Arc::new(chunk));
}
self.pending_chunks.remove(&key);
},
diff --git a/common/net/src/msg/server.rs b/common/net/src/msg/server.rs
index 5596945f86..033ed0892e 100644
--- a/common/net/src/msg/server.rs
+++ b/common/net/src/msg/server.rs
@@ -12,7 +12,7 @@ use common::{
};
use hashbrown::HashMap;
use serde::{Deserialize, Serialize};
-use std::{sync::Arc, time::Duration};
+use std::time::Duration;
use vek::*;
///This struct contains all messages the server might send (on different
diff --git a/server/src/sys/msg/terrain.rs b/server/src/sys/msg/terrain.rs
index 009d8dfa6e..78209ef68b 100644
--- a/server/src/sys/msg/terrain.rs
+++ b/server/src/sys/msg/terrain.rs
@@ -9,7 +9,6 @@ use common_ecs::{Job, Origin, ParMode, Phase, System};
use common_net::msg::{ClientGeneral, CompressedData, ServerGeneral};
use rayon::iter::ParallelIterator;
use specs::{Entities, Join, ParJoin, Read, ReadExpect, ReadStorage};
-use std::sync::Arc;
use tracing::{debug, trace};
/// This system will handle new messages from clients
diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs
index 50c9be9cce..3294c13059 100644
--- a/server/src/sys/terrain.rs
+++ b/server/src/sys/terrain.rs
@@ -246,7 +246,7 @@ impl<'a> System<'a> for Sys {
new_chunks.into_par_iter().for_each(|(key, chunk)| {
let mut msg = Some(ServerGeneral::TerrainChunkUpdate {
key,
- chunk: Ok(chunk),
+ chunk: Ok(CompressedData::compress(&*chunk, 5)),
});
let mut lazy_msg = None;
diff --git a/server/src/sys/terrain_sync.rs b/server/src/sys/terrain_sync.rs
index ebbe7bb95c..305427457b 100644
--- a/server/src/sys/terrain_sync.rs
+++ b/server/src/sys/terrain_sync.rs
@@ -4,7 +4,6 @@ use common_ecs::{Job, Origin, Phase, System};
use common_net::msg::{CompressedData, ServerGeneral};
use common_state::TerrainChanges;
use specs::{Join, Read, ReadExpect, ReadStorage};
-use std::sync::Arc;
/// This systems sends new chunks to clients as well as changes to existing
/// chunks