jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

consistency

Browse Source
This commit is contained in:
Andy Newjack 2020-06-08 13:19:36 -03:00
parent 993c81a162
commit b1b387c3ae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ship/packet/handler/message.rs
View File

@ -162,11 +162,11 @@ where
} }
pub fn update_player_position(id: ClientId, pub fn update_player_position(id: ClientId,
clients: &mut Clients, message: &GameMessage,
client_location: &ClientLocation, clients: &mut Clients,
rooms: &Rooms, client_location: &ClientLocation,
message: &GameMessage,) rooms: &Rooms)
-> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> { -> Result<Box<dyn Iterator<Item = (ClientId, SendShipPacket)> + Send>, ShipError> {
let client = clients.get_mut(&id).ok_or(ShipError::ClientNotFound(id))?; let client = clients.get_mut(&id).ok_or(ShipError::ClientNotFound(id))?;
if let Ok(room_id) = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() }) { if let Ok(room_id) = client_location.get_room(id).map_err(|err| -> ClientLocationError { err.into() }) {
let room = rooms.get(room_id.0) let room = rooms.get(room_id.0)

2
src/ship/ship.rs
View File

@ -287,7 +287,7 @@ impl<EG: EntityGateway> ShipServerState<EG> {
GameMessage::PlayerWarpingToFloor(_) | GameMessage::PlayerTeleported(_) | GameMessage::PlayerStopped(_) | GameMessage::PlayerWarpingToFloor(_) | GameMessage::PlayerTeleported(_) | GameMessage::PlayerStopped(_) |
GameMessage::PlayerLoadedIn(_) | GameMessage::PlayerWalking(_) | GameMessage::PlayerRunning(_) | GameMessage::PlayerLoadedIn(_) | GameMessage::PlayerWalking(_) | GameMessage::PlayerRunning(_) |
GameMessage::PlayerWarped(_) | GameMessage::PlayerChangedFloor(_) | GameMessage::InitializeSpeechNpc(_) => { GameMessage::PlayerWarped(_) | GameMessage::PlayerChangedFloor(_) | GameMessage::InitializeSpeechNpc(_) => {
handler::message::update_player_position(id, &mut self.clients, &mut self.client_location, &self.rooms, &msg.msg) handler::message::update_player_position(id, &msg.msg, &mut self.clients, &mut self.client_location, &self.rooms)
}, },
_ => { _ => {
let cmsg = msg.clone(); let cmsg = msg.clone();