Skip to content

tp to last position if we receive an OOB position #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MarkJoaquim wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

tp to last position if we receive an OOB position #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3df886
tp to last position if we receive an OOB position
Mar 9, 2020
55b670f
keep the look angle if we have it
Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/interfaces/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ define_interface!(
StatusResponse,
status_response,
[conn_id: Uuid, version: Version, description: Description]
),
(
TeleportToLastValidPos,
teleport_to_last_valid_pos,
[conn_id: Uuid, look: Option<Angle>]
)
);

Expand Down
126 changes: 72 additions & 54 deletions src/services/patchwork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use super::interfaces::messenger::Messenger;
use super::interfaces::packet_processor::PacketProcessor;
use super::interfaces::patchwork::Operations;
use super::interfaces::player::{PlayerState, Position as PlayerPosition};
use super::interfaces::player::{
PlayerState, Position as PlayerPosition, Angle as PlayerAngle
};
use super::map::{Map, Peer, PeerConnection, Position};
use super::packet;
use super::packet::Packet;
Expand Down Expand Up @@ -50,59 +52,66 @@ pub fn start<
map_index: 0,
conn_id: None,
});
match &patchwork.maps[anchor.map_index].peer_connection {
Some(_) => match msg.packet {
Packet::Unknown => {}
_ => {
trace!(
"Routing packet from conn_id {:?} through anchor",
msg.conn_id
);
player_state.anchored_move_and_look(
msg.conn_id,
extract_player_position((&msg.packet).clone()),
None,
);
messenger.send_packet(anchor.conn_id.unwrap(), msg.packet.clone());
}
},
None => {
trace!("Routing packet from conn_id {:?} locally", msg.conn_id);
gameplay_router::route_packet(
msg.packet.clone(),
msg.conn_id,
player_state.clone(),
sender.clone(),
);
}
Comment on lines -53 to -77
Copy link
Owner

@DuncanUszkay1 DuncanUszkay1 Mar 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why delete this? Won't all non-positional packets get ignored now?

Copy link
Collaborator Author

@MarkJoaquim MarkJoaquim Mar 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah whoops, I was just trying to avoid handling position packets that are out of bounds so I moved it to after we check the map position but you're right that this will ignore non position packets...

}
if let Some(position) = extract_map_position((&msg.packet).clone()) {
let new_map_index = patchwork_clone.position_map_index(position);
if new_map_index != anchor.map_index {
anchor.disconnect(messenger.clone());
*anchor = match &patchwork.maps[new_map_index].peer_connection {
Some(peer_connection) => Anchor::connect(
peer_connection.peer.clone(),
msg.conn_id,
new_map_index,
patchwork.maps[new_map_index].position.x,
messenger.clone(),
player_state.clone(),
)
.unwrap(),
None => {
gameplay_router::route_packet(
msg.packet.clone(),
msg.conn_id,
player_state.clone(),
sender.clone(),
);
if patchwork.maps[anchor.map_index].peer_connection.is_some() {
player_state.reintroduce(msg.conn_id);
match patchwork_clone.position_map_index(position) {
None => {
let look = extract_player_look((&msg.packet).clone());
player_state.teleport_to_last_valid_pos(msg.conn_id, look);
},
Some(new_map_index) => {
match &patchwork.maps[anchor.map_index].peer_connection {
Some(_) => match msg.packet {
Packet::Unknown => {}
_ => {
trace!(
"Routing packet from conn_id {:?} through anchor",
msg.conn_id
);
player_state.anchored_move_and_look(
msg.conn_id,
extract_player_position((&msg.packet).clone()),
None,
);
messenger.send_packet(anchor.conn_id.unwrap(), msg.packet.clone());
}
},
None => {
trace!("Routing packet from conn_id {:?} locally", msg.conn_id);
gameplay_router::route_packet(
msg.packet.clone(),
msg.conn_id,
player_state.clone(),
sender.clone(),
);
}
Anchor {
conn_id: None,
map_index: new_map_index,
}
if new_map_index != anchor.map_index {
anchor.disconnect(messenger.clone());
*anchor = match &patchwork.maps[new_map_index].peer_connection {
Some(peer_connection) => Anchor::connect(
peer_connection.peer.clone(),
msg.conn_id,
new_map_index,
patchwork.maps[new_map_index].position.x,
messenger.clone(),
player_state.clone(),
)
.unwrap(),
None => {
gameplay_router::route_packet(
msg.packet.clone(),
msg.conn_id,
player_state.clone(),
sender.clone(),
);
if patchwork.maps[anchor.map_index].peer_connection.is_some() {
player_state.reintroduce(msg.conn_id);
}
Anchor {
conn_id: None,
map_index: new_map_index,
}
}
}
}
}
Expand Down Expand Up @@ -147,6 +156,16 @@ fn extract_player_position(packet: Packet) -> Option<PlayerPosition> {
}
}

fn extract_player_look(packet: Packet) -> Option<PlayerAngle> {
match packet {
Packet:: PlayerPositionAndLook(packet) => Some(PlayerAngle {
pitch: packet.pitch,
yaw: packet.yaw
}),
_=> None,
}
}

#[derive(Debug, Clone)]
struct Anchor {
map_index: usize,
Expand Down Expand Up @@ -215,11 +234,10 @@ impl Patchwork {
.push(Map::new(next_position, self.next_entity_id_block()));
}

pub fn position_map_index(self, position: Position) -> usize {
pub fn position_map_index(self, position: Position) -> Option<usize> {
self.maps
.into_iter()
.position(|map| map.position == position)
.expect("Could not find map for position")
}

pub fn connect_map<M: Messenger + Clone>(
Expand Down
25 changes: 25 additions & 0 deletions src/services/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,19 @@ fn handle_message<M: Messenger + Clone, B: BlockState + Clone, PA: PatchworkStat
};
messenger.send_packet(msg.conn_id, Packet::StatusResponse(status_response));
}
Operations::TeleportToLastValidPos(msg) => {
trace!(
"Teleporting to last valid position for conn_id {:?}",
msg.conn_id
);
let player = players
.get(&msg.conn_id)
.expect("Could not teleport to valid position: player not found");
messenger.send_packet(
msg.conn_id,
Packet::ClientboundPlayerPositionAndLook(player.pos_last_valid_packet(msg.look))
);
}
}
}

Expand Down Expand Up @@ -247,6 +260,18 @@ impl Player {
}
}

pub fn pos_last_valid_packet(&self, look: Option<Angle>) -> ClientboundPlayerPositionAndLook {
ClientboundPlayerPositionAndLook {
x: self.position.x,
y: self.position.y,
z: self.position.z,
yaw: look.unwrap_or(self.angle).yaw,
pitch: look.unwrap_or(self.angle).pitch,
flags: 0,
teleport_id: 0
}
}

pub fn pos_and_look_packet(&self) -> ClientboundPlayerPositionAndLook {
ClientboundPlayerPositionAndLook {
x: self.position.x,
Expand Down