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

rebase fix

Browse Source
This commit is contained in:
Imbris 2023-06-04 14:24:01 -04:00
parent b72bf74563
commit 9a12de5fcf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use specs::{saveload::MarkerAllocator, world::WorldExt, Entity as EcsEntity, Join}; use specs::{world::WorldExt, Entity as EcsEntity, Join};
use vek::*; use vek::*;
use common::{ use common::{
@ -21,7 +21,7 @@ use common::{
outcome::Outcome, outcome::Outcome,
rtsim::RtSimVehicle, rtsim::RtSimVehicle,
terrain::{Block, SpriteKind}, terrain::{Block, SpriteKind},
uid::{Uid, UidAllocator}, uid::{IdMaps, Uid},
vol::ReadVol, vol::ReadVol,
}; };
use common_net::sync::WorldSyncExt; use common_net::sync::WorldSyncExt;
@ -177,11 +177,11 @@ pub fn handle_mount_volume(server: &mut Server, rider: EcsEntity, volume_pos: Vo
}).is_ok(); }).is_ok();
#[cfg(feature = "worldgen")] #[cfg(feature = "worldgen")]
if _link_successful { if _link_successful {
let uid_allocator = state.ecs().read_resource::<UidAllocator>(); let uid_allocator = state.ecs().read_resource::<IdMaps>();
if let Some(rider_entity) = uid_allocator.retrieve_entity_internal(rider.0) if let Some(rider_entity) = uid_allocator.uid_entity(rider)
&& let Some(rider_actor) = state.entity_as_actor(rider_entity) && let Some(rider_actor) = state.entity_as_actor(rider_entity)
&& let Some(volume_pos) = volume_pos.try_map_entity(|uid| { && let Some(volume_pos) = volume_pos.try_map_entity(|uid| {
let entity = uid_allocator.retrieve_entity_internal(uid.0)?; let entity = uid_allocator.uid_entity(uid)?;
state.read_storage::<RtSimVehicle>().get(entity).map(|v| v.0) state.read_storage::<RtSimVehicle>().get(entity).map(|v| v.0)
}) { }) {
state.ecs().write_resource::<RtSim>().hook_character_mount_volume( state.ecs().write_resource::<RtSim>().hook_character_mount_volume(