gameServer2/src/server/room.rs
changeset 14371 31717e1436cd
parent 13810 0463a4221327
--- a/gameServer2/src/server/room.rs	Fri Nov 30 17:09:08 2018 +0100
+++ b/gameServer2/src/server/room.rs	Fri Nov 30 22:37:29 2018 +0300
@@ -228,7 +228,7 @@
 
     pub fn find_team<F>(&self, f: F) -> Option<&TeamInfo>
         where F: Fn(&TeamInfo) -> bool {
-        self.teams.iter().map(|(_, t)| t).find(|t| f(*t))
+        self.teams.iter().find_map(|(_, t)| Some(t).filter(|t| f(&t)))
     }
 
     pub fn client_teams(&self, client_id: ClientId) -> impl Iterator<Item = &TeamInfo> {