From 7ca6f9d03e90d4fc2882cc909932e9d86ffd2bdf Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Mon, 26 Jun 2023 18:46:32 -0500 Subject: [PATCH] did anything change? --- client/src/index.ts | 2 +- server/src/entity.rs | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/client/src/index.ts b/client/src/index.ts index 2a098f28bf43905c5675ccd3b41e9633d63d700b..3f4713d5ab8dc90287bc1152971cd0a981d317d0 100644 --- a/client/src/index.ts +++ b/client/src/index.ts @@ -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(); diff --git a/server/src/entity.rs b/server/src/entity.rs index 917c6b0323d4bc98d9aba2e29d38830b5f21145c..654f0f39ed482d3b49ce388e307371d5406b5e41 100644 --- a/server/src/entity.rs +++ b/server/src/entity.rs @@ -81,16 +81,12 @@ impl EntityHandler { None } pub fn get_player(&self, addr: SocketAddr) -> Option { - 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 { let mut modules = Vec::new();