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 deadlock + warnings

Browse source
This commit is contained in:
mat 2022-11-23 19:26:03 -06:00
parent 975acd005f
commit 1d359dace7
7 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,17 +36,15 @@ use azalea_world::{
};
use log::{debug, error, info, trace, warn};
use parking_lot::{Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard};
use std::time::Duration;
use std::{
collections::HashMap,
fmt::Debug,
io::{self, Cursor},
sync::Arc,
time::Instant,
};
use thiserror::Error;
use tokio::{
sync::mpsc::{self, Receiver, Sender, UnboundedReceiver, UnboundedSender},
sync::mpsc::{self, Receiver, Sender},
task::JoinHandle,
time::{self},
};
@ -244,7 +242,9 @@ impl Client {
// we got the GameConnection, so the server is now connected :)
let client = Client::new(game_profile, conn, None);
tx.send(Event::Initialize).await;
tx.send(Event::Initialize)
.await
.expect("Failed to send event");
// just start up the game loop and we're ready!
@ -422,7 +422,7 @@ impl Client {
client: &Client,
tx: &Sender<Event>,
) -> Result<(), HandleError> {
tx.send(Event::Packet(Box::new(packet.clone()))).await;
tx.send(Event::Packet(Box::new(packet.clone()))).await?;
match packet {
ClientboundGamePacket::Login(p) => {
debug!("Got login packet");
@ -535,7 +535,7 @@ impl Client {
)
.await?;
tx.send(Event::Login).await;
tx.send(Event::Login).await?;
}
ClientboundGamePacket::SetChunkCacheRadius(p) => {
debug!("Got set chunk cache radius packet {:?}", p);
@ -686,7 +686,7 @@ impl Client {
}
Action::UpdateGameMode(players) => {
for player in players {
if let Some(p) = client.players.write().get_mut(&player.uuid) {
if let Some(p) = players_lock.get_mut(&player.uuid) {
p.gamemode = player.gamemode;
events.push(Event::UpdatePlayers(
UpdatePlayersEvent::GameMode {
@ -755,7 +755,7 @@ impl Client {
}
}
for event in events {
tx.send(event).await;
tx.send(event).await?;
}
}
ClientboundGamePacket::SetChunkCacheCenter(p) => {
@ -834,7 +834,7 @@ impl Client {
debug!("Got initialize border packet {:?}", p);
}
ClientboundGamePacket::SetTime(p) => {
// debug!("Got set time packet {:?}", p);
debug!("Got set time packet {:?}", p);
}
ClientboundGamePacket::SetDefaultSpawnPosition(p) => {
debug!("Got set default spawn position packet {:?}", p);
@ -898,13 +898,13 @@ impl Client {
ClientboundGamePacket::PlayerChat(p) => {
debug!("Got player chat packet {:?}", p);
tx.send(Event::Chat(ChatPacket::Player(Box::new(p.clone()))))
.await;
.await?;
}
ClientboundGamePacket::SystemChat(p) => {
debug!("Got system chat packet {:?}", p);
tx.send(Event::Chat(ChatPacket::System(p.clone()))).await;
tx.send(Event::Chat(ChatPacket::System(p.clone()))).await?;
}
ClientboundGamePacket::Sound(p) => {
ClientboundGamePacket::Sound(_p) => {
// debug!("Got sound packet {:?}", p);
}
ClientboundGamePacket::LevelEvent(p) => {
@ -976,7 +976,7 @@ impl Client {
// because of https://github.com/rust-lang/rust/issues/57478
if !*client.dead.lock() {
*client.dead.lock() = true;
tx.send(Event::Death(Some(Box::new(p.clone())))).await;
tx.send(Event::Death(Some(Box::new(p.clone())))).await?;
}
}
}
@ -1046,7 +1046,9 @@ impl Client {
}
}
tx.send(Event::Tick).await;
tx.send(Event::Tick)
.await
.expect("Sending tick event should never fail");
// TODO: if we're a passenger, send the required packets

1
azalea-client/src/movement.rs
View file

@ -12,7 +12,6 @@ use azalea_protocol::packets::game::{
serverbound_move_player_status_only_packet::ServerboundMovePlayerStatusOnlyPacket,
};
use azalea_world::MoveEntityError;
use log::info;
use thiserror::Error;
#[derive(Error, Debug)]

1
azalea-world/src/entity_storage.rs
View file

@ -6,7 +6,6 @@ use parking_lot::RwLock;
use std::{
collections::HashMap,
sync::{Arc, Weak},
time::{Duration, Instant},
};
use uuid::Uuid;

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

@ -6,13 +6,8 @@ use crate::{
use azalea_block::BlockState;
use azalea_buf::BufReadError;
use azalea_core::{BlockPos, ChunkPos, PositionDelta8, Vec3};
use log::{info, warn};
use parking_lot::{Mutex, RwLock};
use std::{
backtrace::Backtrace,
fmt::Debug,
time::{Duration, Instant},
};
use std::{backtrace::Backtrace, fmt::Debug};
use std::{fmt::Formatter, io::Cursor, sync::Arc};
use uuid::Uuid;

2
azalea/src/pathfinder/mod.rs
View file

@ -6,7 +6,7 @@ use crate::{Client, Event};
use async_trait::async_trait;
use azalea_core::{BlockPos, CardinalDirection};
use azalea_world::entity::EntityData;
use log::{debug, info};
use log::{debug, };
use mtdstarlite::Edge;
pub use mtdstarlite::MTDStarLite;
use parking_lot::Mutex;

4
azalea/src/swarm/mod.rs
View file

@ -266,7 +266,9 @@ where
// rx is used to receive events from the bot
let (tx, mut rx) = mpsc::channel(1);
let mut bot = Client::new(game_profile, conn, Some(self.worlds.clone()));
tx.send(Event::Initialize).await;
tx.send(Event::Initialize)
.await
.expect("Failed to send event");
bot.start_tasks(tx);
bot.plugins = Arc::new(self.plugins.clone().build());

3
bot/src/main.rs
View file

@ -15,7 +15,6 @@ async fn main() -> anyhow::Result<()> {
env_logger::init();
{
// only for #[cfg]
use parking_lot::deadlock;
use std::thread;
use std::time::Duration;
@ -42,7 +41,7 @@ async fn main() -> anyhow::Result<()> {
let mut accounts = Vec::new();
let mut states = Vec::new();
for i in 0..1 {
for i in 0..5 {
accounts.push(Account::offline(&format!("bot{}", i)));
states.push(State::default());
}