From 9967c0e85f38bf299ac10c0a4abc03bcab996121 Mon Sep 17 00:00:00 2001
From: zumbiepig <121742281+zumbiepig@users.noreply.github.com>
Date: Sat, 31 Aug 2024 08:55:06 -0700
Subject: [PATCH] stuff

---
 src/resources/scripts/eagler-launch/1.5.2/main.ts        | 3 +--
 src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts | 4 ++--
 src/resources/scripts/eagler-launch/1.8.8/main.ts        | 3 +--
 src/resources/scripts/eagler-launch/1.9.4/main.ts        | 7 ++-----
 src/resources/scripts/eagler-launch/b1.3/main.ts         | 3 +--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/resources/scripts/eagler-launch/1.5.2/main.ts b/src/resources/scripts/eagler-launch/1.5.2/main.ts
index 92bf105..d7ef662 100644
--- a/src/resources/scripts/eagler-launch/1.5.2/main.ts
+++ b/src/resources/scripts/eagler-launch/1.5.2/main.ts
@@ -33,8 +33,7 @@ window.addEventListener('load', function () {
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
-	const server = urlParams.get('server');
-	if (server) window.eaglercraftOpts.joinServer = server;
+	window.eaglercraftOpts.joinServer = urlParams.get('server') ?? undefined;
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts b/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts
index 4965d68..b3dc6ad 100644
--- a/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts
+++ b/src/resources/scripts/eagler-launch/1.8.8/eaglerforge.ts
@@ -17,8 +17,8 @@ window.addEventListener('load', () => {
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
-	const server = urlParams.get('server');
-	if (server) window.eaglercraftXOpts.joinServer = urlParams.get('server');
+	window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined;
+	window.eaglercraftXOpts.Mods = storage.local.get('mods') || [];
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/1.8.8/main.ts b/src/resources/scripts/eagler-launch/1.8.8/main.ts
index 4965d68..38e65a7 100644
--- a/src/resources/scripts/eagler-launch/1.8.8/main.ts
+++ b/src/resources/scripts/eagler-launch/1.8.8/main.ts
@@ -17,8 +17,7 @@ window.addEventListener('load', () => {
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
-	const server = urlParams.get('server');
-	if (server) window.eaglercraftXOpts.joinServer = urlParams.get('server');
+	window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined;
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/1.9.4/main.ts b/src/resources/scripts/eagler-launch/1.9.4/main.ts
index fb2f11f..897cddf 100644
--- a/src/resources/scripts/eagler-launch/1.9.4/main.ts
+++ b/src/resources/scripts/eagler-launch/1.9.4/main.ts
@@ -4,9 +4,7 @@ window.addEventListener('load', () => {
 	window.eaglercraftXOpts = {
 		container: 'game_frame',
 		assetsURI: 'assets.epk',
-		servers: [
-			{ addr: 'wss://eagler.xyz', name: 'TemuzX' },
-		],
+		servers: [{ addr: 'wss://eagler.xyz', name: 'TemuzX' }],
 		relays: [
 			{ addr: 'wss://relay.deev.is/', comment: 'lax1dude relay #1', primary: relayId === 0 },
 			{ addr: 'wss://relay.lax1dude.net/', comment: 'lax1dude relay #2', primary: relayId === 1 },
@@ -15,8 +13,7 @@ window.addEventListener('load', () => {
 	};
 
 	const urlParams = new URLSearchParams(window.location.search);
-	const server = urlParams.get('server');
-	if (server) window.eaglercraftXOpts.joinServer = server;
+	window.eaglercraftXOpts.joinServer = urlParams.get('server') ?? undefined;
 
 	main();
 });
diff --git a/src/resources/scripts/eagler-launch/b1.3/main.ts b/src/resources/scripts/eagler-launch/b1.3/main.ts
index 03d685d..e670055 100644
--- a/src/resources/scripts/eagler-launch/b1.3/main.ts
+++ b/src/resources/scripts/eagler-launch/b1.3/main.ts
@@ -6,8 +6,7 @@ window.addEventListener('load', function () {
 	];
 
 	const urlParams = new URLSearchParams(window.location.search);
-	const server = urlParams.get('server');
-	if (server) window.minecraftOpts.push(s);
+	window.minecraftOpts.push(urlParams.get('server') ?? undefined);
 
 	main();
 });