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 'test-server_fix' into 'master'

Browse Source 
Fix test-server

See merge request veloren/veloren!3227
This commit is contained in:
Imbris 2022-02-21 02:29:20 +00:00
commit 423ee8d14b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config
View File

@ -10,7 +10,7 @@ csv-export = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv
csv-import = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv_import"
# server-cli
server = "run --bin veloren-server-cli"
test-server = "run --bin veloren-server-cli --no-default-features simd"
test-server = "run --bin veloren-server-cli --no-default-features --features simd"
tracy-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
tracy-world-server = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow"
tracy-world-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow_debuginfo"

3
server/src/test_world.rs
View File

@ -1,4 +1,5 @@
use common::{
calendar::Calendar,
generation::{ChunkSupplement, EntityInfo},
resources::TimeOfDay,
terrain::{
@ -46,7 +47,7 @@ impl World {
_index: IndexRef,
chunk_pos: Vec2<i32>,
_should_continue: impl FnMut() -> bool,
_time: Option<TimeOfDay>,
_time: Option<(TimeOfDay, Calendar)>,
) -> Result<(TerrainChunk, ChunkSupplement), ()> {
let (x, y) = chunk_pos.map(|e| e.to_le_bytes()).into_tuple();
let mut rng = SmallRng::from_seed([