From 84d27d15396e4e6bd3a49acb1895c19c368ce6bc Mon Sep 17 00:00:00 2001
From: ghostlyzsh <pokeball.181818@gmail.com>
Date: Thu, 11 May 2023 18:11:13 -0500
Subject: [PATCH] bug fix attempts?

---
 server/src/manager.rs | 8 ++++----
 server/src/timer.rs   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/src/manager.rs b/server/src/manager.rs
index de2d08f9fe80e7e80b298be8a62d53946a0c1388..4afe79915afa1bbde432b834813246bbb8b1329c 100644
--- a/server/src/manager.rs
+++ b/server/src/manager.rs
@@ -4,7 +4,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use nalgebra::point;
 use rapier2d_f64::na::Vector2;
-use rapier2d_f64::prelude::{IntegrationParameters, PhysicsPipeline, IslandManager, BroadPhase, NarrowPhase, ImpulseJointSet, MultibodyJointSet, CCDSolver, RigidBodySet, ColliderSet, RigidBodyHandle, ImpulseJointHandle, RigidBodyBuilder, ColliderBuilder, FixedJointBuilder, Real, MassProperties, Isometry};
+use rapier2d_f64::prelude::{IntegrationParameters, PhysicsPipeline, IslandManager, BroadPhase, NarrowPhase, ImpulseJointSet, MultibodyJointSet, CCDSolver, RigidBodySet, ColliderSet, RigidBodyHandle, ImpulseJointHandle, RigidBodyBuilder, ColliderBuilder, FixedJointBuilder, Real, MassProperties, Isometry, PrismaticJointBuilder};
 use async_std::sync::RwLock;
 use async_std::channel::Sender;
 use starkingdoms_protocol::api::APISavedPlayerData;
@@ -163,7 +163,7 @@ impl AttachedModule {
         let module_collider = ColliderBuilder::cuboid(25.0 / SCALE, 25.0 / SCALE)
             .mass_properties(module.mass_properties)
             .build();
-        let module_body = RigidBodyBuilder::dynamic()
+        let module_body = RigidBodyBuilder::fixed()
             .translation(module.translation)
             .rotation(module.heading)
             .build();
@@ -173,10 +173,10 @@ impl AttachedModule {
             -0. / SCALE * rotation.cos() +100. / SCALE * rotation.sin(), 
             -0. / SCALE * rotation.sin() -100. / SCALE * rotation.cos()
         ];
-        let attach_joint = FixedJointBuilder::new()
+        let attach_joint = PrismaticJointBuilder::new(Vector2::x_axis())
             .local_anchor1(anchor)
             .local_anchor2(point![0.0, 0.0 / SCALE])
-            .local_frame2(Isometry::rotation(rotation))
+            //.local_frame2(Isometry::rotation(rotation))
             .build();
         let attach_joint_handle = data.impulse_joint_set.insert(parent_handle, attached_handle, attach_joint, true);
         let attached_module = AttachedModule {
diff --git a/server/src/timer.rs b/server/src/timer.rs
index 3857917523aafc1887f28adee2d3d38bda67fcb2..a321a7c1f8dd1b853a87c58e4f97773b37a3b6d8 100644
--- a/server/src/timer.rs
+++ b/server/src/timer.rs
@@ -103,7 +103,7 @@ pub async fn timer_main(mgr: ClientManager, physics_data_orig: Arc<RwLock<Physic
                 module_body.reset_forces(true);
                 module_body.reset_torques(true);
                 let grav_force = entities.gravity((module_body.translation().x, module_body.translation().y), module_body.mass());
-                module_body.apply_impulse(vector![grav_force.0, grav_force.1], true);
+                //module_body.apply_impulse(vector![grav_force.0, grav_force.1], true);
                 let id = entities.get_from_module(module).unwrap();
                 if let Entity::Module(p_module) = entities.entities.get_mut(&id).unwrap() {
                     p_module.lifetime += 5./1000.;
@@ -134,7 +134,7 @@ pub async fn timer_main(mgr: ClientManager, physics_data_orig: Arc<RwLock<Physic
                 player_body.reset_torques(true);
                 let planets = entities.read().await;
                 let grav_force = planets.gravity((player_body.translation().x, player_body.translation().y), player_body.mass());
-                player_body.apply_impulse(vector![grav_force.0, grav_force.1], true);
+                //player_body.apply_impulse(vector![grav_force.0, grav_force.1], true);
 
                 let mut left_top_thruster: f64 = 0.0;
                 let mut right_top_thruster: f64 = 0.0;