majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix typo in method name

Browse Source
This commit is contained in:
Luk-ESC
2024-08-21 22:38:28 +02:00
committed by lukas0008
parent e41748b4ad
commit afa68f381c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pumpkin/src/client/player_packet.rs
View File

@@ -204,7 +204,7 @@ impl Client {
};
let player = self.player.as_mut().unwrap();
let id = player.entity_id();
server.broadcast_packet_expect(
server.broadcast_packet_except(
&[&self.token],
&CEntityAnimation::new(id.into(), animation as u8),
)
@@ -305,7 +305,7 @@ impl Client {
let packet = &CHurtAnimation::new(&entity_id, attacker_player.entity.yaw);
self.send_packet(packet);
client.send_packet(packet);
server.broadcast_packet_expect(
server.broadcast_packet_except(
&[self.token.as_ref(), token.as_ref()],
&CHurtAnimation::new(&entity_id, 10.0),
)

9
pumpkin/src/server.rs
View File

@@ -141,11 +141,11 @@ impl Server {
if client.is_player() {
let id = client.player.as_ref().unwrap().entity_id();
let uuid = client.gameprofile.as_ref().unwrap().id;
self.broadcast_packet_expect(
self.broadcast_packet_except(
&[&client.token],
&CRemovePlayerInfo::new(1.into(), &[UUID(uuid)]),
);
self.broadcast_packet_expect(&[&client.token], &CRemoveEntities::new(&[id.into()]))
self.broadcast_packet_except(&[&client.token], &CRemoveEntities::new(&[id.into()]))
}
}
@@ -241,7 +241,7 @@ impl Server {
let gameprofile = client.gameprofile.as_ref().unwrap();
// spawn player for every client
self.broadcast_packet_expect(
self.broadcast_packet_except(
&[&client.token],
// TODO: add velo
&CSpawnEntity::new(
@@ -327,7 +327,8 @@ impl Server {
}
}
pub fn broadcast_packet_expect<P>(&self, from: &[&Token], packet: &P)
/// Sends a packet to all players except those specified in `from`
pub fn broadcast_packet_except<P>(&self, from: &[&Token], packet: &P)
where
P: ClientPacket,
{