mat/azalea
1
2
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2025-08-02 14:26:04 +00:00
Code Issues Projects Releases Packages Activity

Compiles

Browse source
This commit is contained in:
mat 2022-05-26 17:59:43 -05:00
parent 0530c57579
commit 51fbbaaf6f
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
azalea-protocol/packet-macros/src/lib.rs
View file

@ -56,7 +56,7 @@ fn create_impl_mcbufreadable(ident: &Ident, data: &Data) -> proc_macro2::TokenSt
} }
syn::Data::Enum(syn::DataEnum { variants, .. }) => { syn::Data::Enum(syn::DataEnum { variants, .. }) => {
let mut match_contents = quote!(); let mut match_contents = quote!();
let mut variant_discrim: usize = 0; let mut variant_discrim: u32 = 0;
for variant in variants { for variant in variants {
let variant_name = &variant.ident; let variant_name = &variant.ident;
match &variant.discriminant.as_ref() { match &variant.discriminant.as_ref() {

16
azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
View file

@ -111,7 +111,7 @@ impl McBufWritable for BrigadierString {
} }
} }
#[derive(Debug, Clone, McBuf)] #[derive(Debug, Clone, Copy, McBuf)]
pub enum BrigadierParserType { pub enum BrigadierParserType {
Bool = 0, Bool = 0,
Double, Double,
@ -236,13 +236,13 @@ impl McBufReadable for BrigadierParser {
BrigadierParserType::String => { BrigadierParserType::String => {
Ok(BrigadierParser::String(BrigadierString::read_into(buf)?)) Ok(BrigadierParser::String(BrigadierString::read_into(buf)?))
} }
BrigadierParserType::Entity { BrigadierParserType::Entity => {
single, let flags = buf.read_byte()?;
players_only, Ok(BrigadierParser::Entity {
} => Ok(BrigadierParser::Entity { single: flags & 0x01 != 0,
single, players_only: flags & 0x02 != 0,
players_only, })
}), }
BrigadierParserType::GameProfile => Ok(BrigadierParser::GameProfile), BrigadierParserType::GameProfile => Ok(BrigadierParser::GameProfile),
BrigadierParserType::BlockPos => Ok(BrigadierParser::BlockPos), BrigadierParserType::BlockPos => Ok(BrigadierParser::BlockPos),
BrigadierParserType::ColumnPos => Ok(BrigadierParser::ColumnPos), BrigadierParserType::ColumnPos => Ok(BrigadierParser::ColumnPos),

5
azalea-protocol/src/packets/login/serverbound_key_packet.rs
View file

@ -1,9 +1,6 @@
use azalea_crypto::SaltSignaturePair; use azalea_crypto::SaltSignaturePair;
use packet_macros::{LoginPacket, McBuf}; use packet_macros::{LoginPacket, McBuf};
use std::{ use std::io::{Read, Write};
hash::Hash,
io::{Read, Write},
};
use crate::mc_buf::{McBufReadable, McBufWritable}; use crate::mc_buf::{McBufReadable, McBufWritable};