Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 25 additions & 1 deletion feather/base/src/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub const META_INDEX_IS_CUSTOM_NAME_VISIBLE: u8 = 3;
pub const META_INDEX_IS_SILENT: u8 = 4;
pub const META_INDEX_NO_GRAVITY: u8 = 5;

pub const META_INDEX_ITEM_SLOT: u8 = 6;
pub const META_INDEX_POSE: u8 = 6;

pub const META_INDEX_FALLING_BLOCK_SPAWN_POSITION: u8 = 7;

Expand Down Expand Up @@ -85,6 +85,30 @@ impl MetaEntry {
}
}

pub enum Pose {
Standing,
FallFlying,
Sleeping,
Swimming,
SpinAttack,
Sneaking,
Dying,
}
Comment thread
Tracreed marked this conversation as resolved.

impl ToMetaEntry for Pose {
fn to_meta_entry(&self) -> MetaEntry {
MetaEntry::Pose(match self {
Self::Standing => 0,
Self::FallFlying => 1,
Self::Sleeping => 2,
Self::Swimming => 3,
Self::SpinAttack => 4,
Self::Sneaking => 5,
Self::Dying => 6,
})
}
}

pub trait ToMetaEntry {
fn to_meta_entry(&self) -> MetaEntry;
}
Expand Down
10 changes: 10 additions & 0 deletions feather/server/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,16 @@ impl Client {
});
}

pub fn send_entity_metadata(&self, network_id: NetworkId, metadata: EntityMetadata) {
if self.network_id == Some(network_id) {
return;
}
self.send_packet(SendEntityMetadata {
entity_id: network_id.0,
entries: metadata,
});
}

pub fn send_abilities(&self, abilities: &base::anvil::player::PlayerAbilities) {
let mut bitfield = 0;
if *abilities.invulnerable {
Expand Down
64 changes: 61 additions & 3 deletions feather/server/src/systems/entity.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
//! Sends entity-related packets to clients.
//! Spawn packets, position updates, equipment, animations, etc.

use base::Position;
use base::{
metadata::{EntityBitMask, Pose, META_INDEX_ENTITY_BITMASK, META_INDEX_POSE},
EntityMetadata, Position,
};
use common::Game;
use ecs::{SysResult, SystemExecutor};
use quill_common::components::OnGround;
use quill_common::{
components::{OnGround, Sprinting},
events::{SneakEvent, SprintEvent},
};

use crate::{entities::PreviousPosition, NetworkId, Server};

mod spawn_packet;

pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
spawn_packet::register(game, systems);
systems.group::<Server>().add_system(send_entity_movement);
systems
.group::<Server>()
.add_system(send_entity_movement)
.add_system(send_entity_sneak_metadata)
.add_system(send_entity_sprint_metadata);
}

/// Sends entity movement packets.
Expand All @@ -31,3 +41,51 @@ fn send_entity_movement(game: &mut Game, server: &mut Server) -> SysResult {
}
Ok(())
}

/// Sends [SendEntityMetadata](protocol::packets::server::play::SendEntityMetadata) packet for when an entity is sneaking.
fn send_entity_sneak_metadata(game: &mut Game, server: &mut Server) -> SysResult {
for (_, (&position, &SneakEvent { is_sneaking }, is_sprinting, &network_id)) in game
.ecs
.query::<(&Position, &SneakEvent, &Sprinting, &NetworkId)>()
.iter()
{
let mut metadata = EntityMetadata::entity_base();
let mut bit_mask = EntityBitMask::empty();

// The Entity can sneak and sprint at the same time, what happens is that when it stops sneaking you immediately start running again.
bit_mask.set(EntityBitMask::CROUCHED, is_sneaking);
bit_mask.set(EntityBitMask::SPRINTING, is_sprinting.0);
metadata.set(META_INDEX_ENTITY_BITMASK, bit_mask.bits());

if is_sneaking {
metadata.set(META_INDEX_POSE, Pose::Sneaking);
} else {
metadata.set(META_INDEX_POSE, Pose::Standing);
}

server.broadcast_nearby_with(position, |client| {
client.send_entity_metadata(network_id, metadata.clone());
});
}
Ok(())
}

/// Sends [SendEntityMetadata](protocol::packets::server::play::SendEntityMetadata) packet for when an entity is sprinting.
fn send_entity_sprint_metadata(game: &mut Game, server: &mut Server) -> SysResult {
for (_, (&position, &SprintEvent { is_sprinting }, &network_id)) in game
.ecs
.query::<(&Position, &SprintEvent, &NetworkId)>()
.iter()
{
let mut metadata = EntityMetadata::entity_base();
let mut bit_mask = EntityBitMask::empty();

bit_mask.set(EntityBitMask::SPRINTING, is_sprinting);
metadata.set(META_INDEX_ENTITY_BITMASK, bit_mask.bits());

server.broadcast_nearby_with(position, |client| {
client.send_entity_metadata(network_id, metadata.clone());
});
}
Ok(())
}