From 2409588706b8fdb69e83773c5e2326c7765e2d2f Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 19 Sep 2024 22:04:04 +0200 Subject: send player in tutorial ended --- server/src/entity/tutorial.rs | 6 ++++-- server/src/server.rs | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'server/src') diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs index 5ec1281d..64bdaf7d 100644 --- a/server/src/entity/tutorial.rs +++ b/server/src/entity/tutorial.rs @@ -59,8 +59,10 @@ impl Entity for Tutorial { self.delete_timer -= TARGET_DT; if self.delete_timer <= 0. { hint = None; - c.packet_out - .push_back(PacketC::TutorialEnded { item: self.target }); + c.packet_out.push_back(PacketC::TutorialEnded { + item: self.target, + player: self.player, + }); } else { hint = Some((None, trm!("s.tutorial.finished"))); } diff --git a/server/src/server.rs b/server/src/server.rs index c9961412..6350d635 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -39,6 +39,9 @@ use std::{ use tokio::sync::broadcast::Sender; pub struct Server { + pub tx: Sender, + pub connections: HashMap>, + pub game: Game, pub data: Arc, @@ -49,8 +52,6 @@ pub struct Server { pub last_movement_update: HashMap, pub index: DataIndex, pub packet_out: VecDeque, - pub tx: Sender, - pub connections: HashMap>, pub scoreboard: ScoreboardStore, pub gamedata_index: GamedataIndex, } -- cgit v1.2.3-70-g09d2