redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-20 14:47:45 +00:00
Code Activity

Fix various Clippy warnings

Browse source
This commit is contained in:
Joshua Goins 2025-03-30 17:59:17 -04:00
parent 7f6a07b813
commit 86b5267a24
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/bin/kawari-world.rs
View file

@ -1,5 +1,4 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType}; use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType};
@ -30,14 +29,10 @@ use kawari::world::{
}, },
}; };
use mlua::{Function, Lua}; use mlua::{Function, Lua};
use std::net::SocketAddr;
use tokio::io::AsyncReadExt; use tokio::io::AsyncReadExt;
use tokio::join; use tokio::join;
use tokio::net::tcp::WriteHalf; use tokio::net::TcpListener;
use tokio::net::{TcpListener, TcpStream}; use tokio::sync::mpsc::{Receiver, UnboundedReceiver, UnboundedSender, channel, unbounded_channel};
use tokio::sync::mpsc::{
Receiver, Sender, UnboundedReceiver, UnboundedSender, channel, unbounded_channel,
};
use tokio::sync::oneshot; use tokio::sync::oneshot;
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
@ -49,7 +44,6 @@ struct ExtraLuaState {
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct Data { struct Data {
clients: HashMap<ClientId, ClientHandle>, clients: HashMap<ClientId, ClientHandle>,
actors: Vec<Actor>,
} }
async fn main_loop(mut recv: Receiver<ToServer>) -> Result<(), std::io::Error> { async fn main_loop(mut recv: Receiver<ToServer>) -> Result<(), std::io::Error> {
@ -181,9 +175,8 @@ async fn start_client(my_handle: oneshot::Receiver<ClientHandle>, mut data: Clie
}; };
data.handle.send(ToServer::NewClient(my_handle)).await; data.handle.send(ToServer::NewClient(my_handle)).await;
let mut connection = data.connection; let connection = data.connection;
let recv = data.recv; let recv = data.recv;
let (_, write) = &connection.socket.split();
// communication channel between client_loop and client_server_loop // communication channel between client_loop and client_server_loop
let (internal_send, internal_recv) = unbounded_channel(); let (internal_send, internal_recv) = unbounded_channel();
@ -1107,7 +1100,7 @@ async fn main() {
.unwrap(); .unwrap();
} }
let (handle, join) = spawn_main_loop(); let (handle, _) = spawn_main_loop();
loop { loop {
let (socket, ip) = listener.accept().await.unwrap(); let (socket, ip) = listener.accept().await.unwrap();
@ -1137,6 +1130,4 @@ async fn main() {
gamedata: game_data.clone(), gamedata: game_data.clone(),
}); });
} }
join.await.unwrap();
} }

2
src/world/connection.rs
View file

@ -9,7 +9,7 @@ use std::{
use tokio::{net::TcpStream, sync::mpsc::Sender, task::JoinHandle}; use tokio::{net::TcpStream, sync::mpsc::Sender, task::JoinHandle};
use crate::{ use crate::{
common::{GameData, ObjectId, ObjectTypeId, Position, timestamp_secs}, common::{GameData, ObjectId, Position, timestamp_secs},
opcodes::ServerZoneIpcType, opcodes::ServerZoneIpcType,
packet::{ packet::{
CompressionType, ConnectionType, PacketSegment, PacketState, SegmentType, parse_packet, CompressionType, ConnectionType, PacketSegment, PacketState, SegmentType, parse_packet,