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

sync

Browse Source
This commit is contained in:
Joshua Barretto 2023-05-11 15:50:42 +01:00 committed by Maxicarlos08
parent 6adca217fe
commit 62d998252d
No known key found for this signature in database
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/events/interaction.rs
View File

@ -17,7 +17,7 @@ use common::{
consts::{MAX_MOUNT_RANGE, MAX_SPRITE_MOUNT_RANGE, SOUND_TRAVEL_DIST_PER_VOLUME}, consts::{MAX_MOUNT_RANGE, MAX_SPRITE_MOUNT_RANGE, SOUND_TRAVEL_DIST_PER_VOLUME},
event::EventBus, event::EventBus,
link::Is, link::Is,
mounting::{Mounting, Rider, VolumeMounting, VolumePos, VolumeRider}, mounting::{Mount, Mounting, Rider, VolumeMounting, VolumePos, VolumeRider},
outcome::Outcome, outcome::Outcome,
rtsim::RtSimVehicle, rtsim::RtSimVehicle,
terrain::{Block, SpriteKind}, terrain::{Block, SpriteKind},

7
server/src/sys/agent.rs
View File

@ -68,10 +68,12 @@ impl<'a> System<'a> for Sys {
read_data.light_emitter.maybe(), read_data.light_emitter.maybe(),
read_data.groups.maybe(), read_data.groups.maybe(),
read_data.rtsim_entities.maybe(), read_data.rtsim_entities.maybe(),
(
!&read_data.is_mounts, !&read_data.is_mounts,
read_data.is_riders.maybe(), read_data.is_riders.maybe(),
read_data.is_volume_riders.maybe(), read_data.is_volume_riders.maybe(),
read_data.pet_states.maybe(), read_data.pet_states.maybe(),
),
) )
.par_join() .par_join()
.for_each_init( .for_each_init(
@ -94,10 +96,7 @@ impl<'a> System<'a> for Sys {
light_emitter, light_emitter,
group, group,
rtsim_entity, rtsim_entity,
_, (_, is_rider, is_volume_rider, pet_state),
is_rider,
is_volume_rider,
pet_state,
)| { )| {
let mut event_emitter = event_bus.emitter(); let mut event_emitter = event_bus.emitter();
let mut rng = thread_rng(); let mut rng = thread_rng();