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 'xMAC94x/netfixE' into 'master'

Browse Source 
keep Presence when possesing

See merge request veloren/veloren!1482
This commit is contained in:
Marcel 2020-11-04 11:28:12 +00:00
commit 602da59b79
1 changed files with 9 additions and 1 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,8 @@
use crate::{client::Client, presence::RegionSubscription, Server};
use crate::{
client::Client,
presence::{Presence, RegionSubscription},
Server,
};
use common::{
comp::{self, item, Pos},
consts::MAX_MOUNT_RANGE,
@ -127,12 +131,16 @@ pub fn handle_possess(server: &Server, possessor_uid: Uid, possesse_uid: Uid) {
clients.insert(possesse, c).ok()?;
//optional entities
let mut players = ecs.write_storage::<comp::Player>();
let mut presence = ecs.write_storage::<Presence>();
let mut subscriptions = ecs.write_storage::<RegionSubscription>();
let mut admins = ecs.write_storage::<comp::Admin>();
let mut waypoints = ecs.write_storage::<comp::Waypoint>();
players
.remove(possessor)
.map(|p| players.insert(possesse, p).ok()?);
presence
.remove(possessor)
.map(|p| presence.insert(possesse, p).ok()?);
subscriptions
.remove(possessor)
.map(|s| subscriptions.insert(possesse, s).ok()?);