M client/src/index.ts => client/src/index.ts +1 -1
@@ 347,7 347,7 @@ async function client_main(server: string, username: string, texture_quality: st
if (global.me !== null) {
let module = global.modules[i];
// @ts-ignore
- let tex = global.spritesheet!["frames"][module_type_to_tex_id(module.moduleType, false)];
+ let tex = global.spritesheet!["frames"][module_type_to_tex_id(module.moduleType, (module.flags & 1) != 0)];
global.context.save();
M server/src/entity.rs => server/src/entity.rs +5 -9
@@ 81,16 81,12 @@ impl EntityHandler {
None
}
pub fn get_player(&self, addr: SocketAddr) -> Option<Player> {
- let mut players = self.get_players();
- for i in 0..players.len() {
- if players[i].0 != addr {
- players.remove(i);
- }
- }
- if players.is_empty() {
- return None;
+ let players = self.get_players();
+ let player = players.iter().find(|p| p.0 == addr);
+ match player {
+ Some(p) => Some(p.1.clone()),
+ None => None,
}
- Some(players[0].clone().1)
}
pub fn get_modules(&self) -> Vec<Module> {
let mut modules = Vec::new();