From 818338b7b1338dade054e252531c2cdb4a10c512 Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Mon, 1 Apr 2024 23:59:30 -0500 Subject: [PATCH] module attachment re-fixed. ship editor untested, but stk gameplay appears to be fully functional --- server/src/main.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/src/main.rs b/server/src/main.rs index 511bbee49a62437947f2e04f6b93a613144e5f2c..000fc5adbaeeb9e6faf041c46b259e960ef389ef 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -155,7 +155,7 @@ fn main() { ) .add_systems(FixedUpdate, save_eligibility) .add_systems(FixedUpdate, convert_modules) - .insert_resource(Time::::from_seconds(1.0/1.0)) + .insert_resource(Time::::from_seconds(1.0 / 60.0)) .run(); info!("Goodbye!"); @@ -239,7 +239,8 @@ fn module_spawn( transform: TransformBundle::from(transform), flags, }); - entity.insert(RigidBody::Dynamic) + entity + .insert(RigidBody::Dynamic) .with_children(|children| { children .spawn(Collider::cuboid(0.375, 0.46875)) @@ -1262,6 +1263,7 @@ fn attach_on_module_tree( parent: Some(entity), children, }); + module_entity.insert(CanAttach(15)); attach.children[attachment_slot] = Some(module.0); module.5.attached = true; if *module.1 == PartType::LandingThruster { @@ -1272,6 +1274,7 @@ fn attach_on_module_tree( .2; *transform = new_transform; } + ret = true; } ret @@ -1718,7 +1721,6 @@ fn on_position_change( packet_send.send(WsEvent::Broadcast { message: packet.into(), }); - } /*let packet = Packet::SaveEligibility { eligible: true }; for _ in 0..10000 {