From 9cfacea01f83a77b2a77d89d185fea2b389cfd7e Mon Sep 17 00:00:00 2001
From: ghostlyzsh <pokeball.181818@gmail.com>
Date: Sun, 7 Jan 2024 21:44:45 -0600
Subject: [PATCH] no more explode

---
 bevy_tungstenite_stk/src/lib.rs |  2 +-
 server/src/main.rs              | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bevy_tungstenite_stk/src/lib.rs b/bevy_tungstenite_stk/src/lib.rs
index 2b659f7170430d3b054dd1e4eece4b6cc604474d..240573cab0cbf7a106fe4437418b298594bf2ee8 100644
--- a/bevy_tungstenite_stk/src/lib.rs
+++ b/bevy_tungstenite_stk/src/lib.rs
@@ -135,7 +135,7 @@ impl StkTungsteniteServerPlugin {
                     move || loop {
                         let msg = l_stream.read().expect("failed to read message from stream");
                         if let Message::Close(_) = msg {
-                            l_stream.close(None).expect("failed to disconnect client");
+                            let _ = l_stream.close(None);
                             l_gtx.send(WsEvent::Close { addr: this_addr }).unwrap();
                             break;
                         }
diff --git a/server/src/main.rs b/server/src/main.rs
index 04f501407670590496c028c80bf2a33182da67ba..d86157d93da25eb3abd5a0d005f1ac732e903ceb 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -95,7 +95,7 @@ fn main() {
         )
         .add_systems(FixedUpdate, save_eligibility)
         .add_systems(FixedUpdate, convert_modules)
-        //.insert_resource(Time::<Fixed>::from_seconds(1.0/20.0))
+        //.insert_resource(Time::<Fixed>::from_seconds(1.0/1.0))
         .run();
 
     info!("Goodbye!");
@@ -1003,21 +1003,21 @@ fn load_savefile(
                 angle_offset = -PI / 2.;
             }
 
+            let transform = 
+                Transform::from_xyz(
+                    p_pos.x + offset.x / SCALE * angle.cos() - offset.y / SCALE * angle.sin(),
+                    p_pos.y + offset.x / SCALE * angle.sin() + offset.y / SCALE * angle.cos(),
+                    0.,
+                )
+                .with_rotation(Quat::from_euler(
+                    EulerRot::ZYX,
+                    angle + angle_offset,
+                    0.,
+                    0.,
+                ));
             let module_id = {
                 let module = commands.spawn(PartBundle {
-                    transform: TransformBundle::from(
-                        Transform::from_xyz(
-                            (p_pos.x + offset.x * angle.cos()) / SCALE,
-                            (p_pos.y + offset.y * angle.sin()) / SCALE,
-                            0.,
-                        )
-                        .with_rotation(Quat::from_euler(
-                            EulerRot::ZYX,
-                            angle + angle_offset,
-                            0.,
-                            0.,
-                        )),
-                    ),
+                    transform: TransformBundle::from(transform),
                     part_type: child.part_type.into(),
                     flags: PartFlags { attached: true },
                 });