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

Fix issues from merge

Browse source
This commit is contained in:
mat 2022-11-20 15:57:55 -06:00
parent 336d155049
commit 04a785a579
5 changed files with 1305 additions and 1319 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2590
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
azalea-client/src/client.rs
View file

@ -332,7 +332,7 @@ impl Client {
}
};
Ok((conn, game_profile))
Ok((conn, profile))
}
/// Write a packet directly to the server.

18
azalea-client/src/player.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use azalea_auth::game_profile::GameProfile;
use azalea_chat::Component;
use azalea_core::GameType;
@ -21,19 +23,3 @@ pub struct PlayerInfo {
/// The player's display name in the tab list.
pub display_name: Option<Component>,
}
impl PlayerInfo {
/// Get a reference to the entity of the player in the world.
pub fn entity<'d>(&'d self, world: &'d World) -> Option<&EntityData> {
world.entity_by_uuid(&self.uuid)
}
/// Get a mutable reference to the entity of the player in the world.
pub fn entity_mut<'d>(&'d mut self, world: &'d mut World) -> Option<&'d mut EntityData> {
world.entity_mut_by_uuid(&self.uuid)
}
pub fn set_uuid(&mut self, uuid: Uuid) {
self.uuid = uuid;
}
}

2
azalea-world/src/world.rs
View file

@ -42,7 +42,7 @@ impl World {
pub fn get_chunk(&self, pos: &ChunkPos) -> Option<Arc<Mutex<Chunk>>> {
self.chunk_storage.get(pos)
}
}
pub fn set_chunk(&mut self, pos: &ChunkPos, chunk: Option<Chunk>) -> Result<(), BufReadError> {
self.chunk_storage

12
azalea/Cargo.toml
View file

@ -11,12 +11,12 @@ version = "0.4.0"
[dependencies]
anyhow = "^1.0.65"
async-trait = "0.1.58"
azalea-block = {version = "0.3.0", path = "../azalea-block"}
azalea-client = {version = "0.3.0", path = "../azalea-client"}
azalea-core = {version = "0.3.0", path = "../azalea-core"}
azalea-physics = {version = "0.3.0", path = "../azalea-physics"}
azalea-protocol = {version = "0.3.0", path = "../azalea-protocol"}
azalea-world = {version = "0.3.0", path = "../azalea-world"}
azalea-block = {version = "0.4.0", path = "../azalea-block"}
azalea-client = {version = "0.4.0", path = "../azalea-client"}
azalea-core = {version = "0.4.0", path = "../azalea-core"}
azalea-physics = {version = "0.4.0", path = "../azalea-physics"}
azalea-protocol = {version = "0.4.0", path = "../azalea-protocol"}
azalea-world = {version = "0.4.0", path = "../azalea-world"}
futures = "0.3.25"
log = "0.4.17"
nohash-hasher = "0.2.0"