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

Server events directly emitted in states now.

Browse Source
This commit is contained in:
Sam
2021-02-07 12:15:29 -05:00
parent 6a1e583d45
commit f026aeb2dc
10 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/states/utils.rs
View File

@ -7,7 +7,7 @@ use crate::{
theropod, Body, CharacterState, LoadoutManip, StateUpdate,
},
consts::{FRIC_GROUND, GRAVITY},
event::LocalEvent,
event::{LocalEvent, ServerEvent},
states::{behavior::JoinData, *},
util::Dir,
};
@ -360,8 +360,17 @@ pub fn attempt_swap_loadout(data: &JoinData, update: &mut StateUpdate) {
}
/// Handles inventory manipulations that affect the loadout
pub fn handle_modify_loadout(update: &mut StateUpdate, loadout_manip: Option<LoadoutManip>) {
update.modify_loadout = loadout_manip;
pub fn handle_modify_loadout(
data: &JoinData,
update: &mut StateUpdate,
loadout_manip: Option<LoadoutManip>,
) {
if let Some(loadout_manip) = loadout_manip {
update.server_events.push_front(ServerEvent::InventoryManip(
data.entity,
loadout_manip.into(),
));
}
}
/// Checks that player can wield the glider and updates `CharacterState` if so