Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2025-07-25 21:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix no default features

Browse Source
This commit is contained in:
Isse
2024-11-13 10:27:18 +01:00
parent a5c5a7958b
commit d33d56c9f7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/events/entity_manipulation.rs
View File

@ -168,6 +168,7 @@ impl ServerEvent for PoiseChangeEvent {
}
}
#[cfg(feature = "worldgen")]
pub fn entity_as_actor(
entity: Entity,
rtsim_entities: &ReadStorage<RtSimEntity>,
@ -197,7 +198,9 @@ pub struct HealthChangeEventData<'a> {
index: ReadExpect<'a, IndexOwned>,
positions: ReadStorage<'a, Pos>,
uids: ReadStorage<'a, Uid>,
#[cfg(feature = "worldgen")]
presences: ReadStorage<'a, Presence>,
#[cfg(feature = "worldgen")]
rtsim_entities: ReadStorage<'a, RtSimEntity>,
agents: WriteStorage<'a, Agent>,
healths: WriteStorage<'a, Health>,

7
server/src/events/inventory_manip.rs
View File

@ -2,7 +2,7 @@ use hashbrown::HashSet;
use rand::{seq::IteratorRandom, Rng};
use specs::{
join::Join, shred, DispatcherBuilder, Entities, Entity as EcsEntity, Read, ReadExpect,
ReadStorage, SystemData, Write, WriteExpect, WriteStorage,
ReadStorage, SystemData, Write, WriteStorage,
};
use tracing::{debug, error, warn};
use vek::{Rgb, Vec3};
@ -25,7 +25,6 @@ use common::{
mounting::VolumePos,
recipe::{self, default_component_recipe_book, default_repair_recipe_book, RecipeBookManifest},
resources::{ProgramTime, Time},
rtsim::RtSimEntity,
terrain::{Block, SpriteKind},
trade::Trades,
uid::{IdMaps, Uid},
@ -79,7 +78,7 @@ pub struct InventoryManipData<'a> {
block_change: Write<'a, common_state::BlockChange>,
trades: Write<'a, Trades>,
#[cfg(feature = "worldgen")]
rtsim: WriteExpect<'a, crate::rtsim::RtSim>,
rtsim: specs::WriteExpect<'a, crate::rtsim::RtSim>,
terrain: ReadExpect<'a, common::terrain::TerrainGrid>,
id_maps: Read<'a, IdMaps>,
time: Read<'a, Time>,
@ -117,7 +116,7 @@ pub struct InventoryManipData<'a> {
#[cfg(feature = "worldgen")]
presences: ReadStorage<'a, comp::Presence>,
#[cfg(feature = "worldgen")]
rtsim_entities: ReadStorage<'a, RtSimEntity>,
rtsim_entities: ReadStorage<'a, common::rtsim::RtSimEntity>,
}
impl ServerEvent for InventoryManipEvent {