move player to master, remove comments

gamedig · Oct 29, 2024 · d2a5970 · d2a5970
1 parent 1f383ff
commit d2a5970
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/crates/lib/src/games/definitions.rs b/crates/lib/src/games/definitions.rs
@@ -149,7 +149,6 @@ pub static GAMES: Map<&'static str, Game> = phf_map! {
     "zps" => game!("Zombie Panic: Source", 27015, Protocol::Valve(Engine::new(17_500))),
     "moe" => game!("Myth Of Empires", 12888, Protocol::Valve(Engine::new(1_371_580))),
     "mordhau" => game!("Mordhau", 27015, Protocol::Valve(Engine::new(629_760))),
-    // "minetest" => game!("Minetest", 30000, Protocol::PROPRIETARY(ProprietaryProtocol::Minetest)),
     "mindustry" => game!("Mindustry", crate::games::mindustry::DEFAULT_PORT, Protocol::PROPRIETARY(ProprietaryProtocol::Mindustry)),
     "nla" => game!("Nova-Life: Amboise", 27015, Protocol::Valve(Engine::new(885_570))),
 };
diff --git a/crates/lib/src/games/minetest/types.rs b/crates/lib/src/games/minetest/types.rs
@@ -1,13 +1,6 @@
-use crate::minetest_master_server::Server;
+use crate::minetest_master_server::{Player, Server};
 use crate::protocols::types::{CommonPlayer, CommonResponse, GenericPlayer};
 use crate::protocols::GenericResponse;
-use serde::{Deserialize, Serialize};
-
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct Player {
-    pub name: String,
-}
 
 impl CommonPlayer for Player {
     fn as_original(&self) -> GenericPlayer { GenericPlayer::Minetest(self) }
@@ -31,13 +24,11 @@ impl CommonResponse for Server {
     fn has_password(&self) -> Option<bool> { Some(self.password) }
 
     fn players(&self) -> Option<Vec<&dyn CommonPlayer>> {
-        None
-        // Some(
-        // self.clients_list
-        // .iter()
-        // .map(|p| Player { name: p.clone() })
-        // .map(|p| p as &dyn CommonPlayer)
-        // .collect(),
-        // )
+        Some(
+            self.clients_list
+                .iter()
+                .map(|p| p as &dyn CommonPlayer)
+                .collect(),
+        )
     }
 }
diff --git a/crates/lib/src/services/minetest_master_server/types.rs b/crates/lib/src/services/minetest_master_server/types.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 pub struct Server {
     pub address: String,
     pub clients: u32,
-    pub clients_list: Vec<String>,
+    pub clients_list: Vec<Player>,
     pub clients_max: u32,
     pub creative: bool,
     pub damage: bool,
@@ -44,3 +44,9 @@ pub struct Response {
     pub total_max: ServersClients,
     pub list: Vec<Server>,
 }
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Player {
+    pub name: String,
+}