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

Fix up merge

Browse Source
This commit is contained in:
Joshua Yanovski 2023-03-29 02:02:06 -07:00
parent 02f18825ef
commit 9aaf4179ef
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@ -6974,11 +6974,8 @@ dependencies = [
"specs",
"tar",
"thread-priority",
<<<<<<< HEAD
"timer-queue",
=======
"tokio",
>>>>>>> 60060a9913 ([WIP] improving thread pool usage and bot client.)
"toml",
"tracing",
"vek 0.15.8",

4
server/src/lib.rs
View File

@ -77,7 +77,7 @@ use common::{
cmd::ServerChatCommand,
comp,
event::{EventBus, ServerEvent},
resources::{BattleMode, GameMode, Time, TimeOfDay},
resources::{BattleMode, Time, TimeOfDay},
rtsim::RtSimEntity,
shared_server_config::ServerConstants,
slowjob::SlowJobPool,
@ -246,8 +246,6 @@ impl Server {
let battlemode_buffer = BattleModeBuffer::default();
let pools = State::pools(GameMode::Server);
#[cfg(feature = "worldgen")]
let (world, index) = World::generate(
settings.world_seed,