From 8daa7c4f249c2103db3364320b3a31d4395eb11f Mon Sep 17 00:00:00 2001 From: jackdotink Date: Sat, 16 Dec 2023 12:16:43 -0600 Subject: [PATCH] fix incorrect output ordering for remote variables --- zap/src/output/client.rs | 4 +--- zap/src/output/server.rs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/zap/src/output/client.rs b/zap/src/output/client.rs index ff417575..cc59e53b 100644 --- a/zap/src/output/client.rs +++ b/zap/src/output/client.rs @@ -17,6 +17,7 @@ impl<'a> Display for ClientFile<'a> { } write!(f, "{}", include_str!("base.luau"))?; + write!(f, "{}", include_str!("client.luau"))?; writeln!(f, "local events = table.create({})", file.ev_decls.len())?; @@ -143,9 +144,6 @@ impl<'a> Display for ClientFile<'a> { writeln!(f, "events[{id}] = {{}}")?; } - // Fire Reliable - write!(f, "{}", include_str!("client.luau"))?; - writeln!(f, "return {{")?; // Output Fire Return diff --git a/zap/src/output/server.rs b/zap/src/output/server.rs index fd65a312..b0e0b481 100644 --- a/zap/src/output/server.rs +++ b/zap/src/output/server.rs @@ -17,6 +17,7 @@ impl<'a> Display for ServerFile<'a> { } write!(f, "{}", include_str!("base.luau"))?; + write!(f, "{}", include_str!("server.luau"))?; writeln!(f, "local events = table.create({})", file.ev_decls.len())?; @@ -153,9 +154,6 @@ impl<'a> Display for ServerFile<'a> { writeln!(f, "events[{id}] = {{}}")?; } - // Fire Reliable - write!(f, "{}", include_str!("server.luau"))?; - writeln!(f, "return {{")?; // Output Fire Return