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 'sam/torvus-fix' into 'master'

Browse Source 
Made changes to fix torvus

See merge request veloren/veloren!1830
This commit is contained in:
Marcel 2021-02-28 16:11:35 +00:00
commit 9ce61ae814
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/lib.rs
View File

@ -265,7 +265,7 @@ impl Client {
let entity = state.ecs_mut().apply_entity_package(entity_package); let entity = state.ecs_mut().apply_entity_package(entity_package);
*state.ecs_mut().write_resource() = time_of_day; *state.ecs_mut().write_resource() = time_of_day;
*state.ecs_mut().write_resource() = material_stats; state.ecs_mut().insert(material_stats);
state.ecs_mut().insert(ability_map); state.ecs_mut().insert(ability_map);
let map_size_lg = common::terrain::MapSizeLg::new(world_map.dimensions_lg) let map_size_lg = common::terrain::MapSizeLg::new(world_map.dimensions_lg)

1
common/sys/src/state.rs
View File

@ -197,7 +197,6 @@ impl State {
ecs.insert(EventBus::<LocalEvent>::default()); ecs.insert(EventBus::<LocalEvent>::default());
ecs.insert(game_mode); ecs.insert(game_mode);
ecs.insert(Vec::<common::outcome::Outcome>::new()); ecs.insert(Vec::<common::outcome::Outcome>::new());
ecs.insert(comp::inventory::item::MaterialStatManifest::default());
// TODO: only register on the server // TODO: only register on the server
ecs.insert(EventBus::<ServerEvent>::default()); ecs.insert(EventBus::<ServerEvent>::default());
ecs.insert(comp::group::GroupManager::default()); ecs.insert(comp::group::GroupManager::default());

4
server/src/lib.rs
View File

@ -183,6 +183,10 @@ impl Server {
"common.abilities.weapon_ability_manifest", "common.abilities.weapon_ability_manifest",
); );
state.ecs_mut().insert(ability_map); state.ecs_mut().insert(ability_map);
let msm = comp::inventory::item::MaterialStatManifest::default();
state.ecs_mut().insert(msm);
state state
.ecs_mut() .ecs_mut()
.insert(CharacterLoader::new(&persistence_db_dir)?); .insert(CharacterLoader::new(&persistence_db_dir)?);