From 905cb85eb765ec73fc2b4ba51e50051583adfc22 Mon Sep 17 00:00:00 2001
From: Star Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 12 Sep 2025 20:25:30 -0400
Subject: [Client] Fixed issue with large datapackages

---
 client/Archipelago/client.gd          | 6 ++++--
 client/Archipelago/manager.gd         | 4 ++--
 client/Archipelago/settings_screen.gd | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/Archipelago/client.gd b/client/Archipelago/client.gd
index 2e080fd..843647d 100644
--- a/client/Archipelago/client.gd
+++ b/client/Archipelago/client.gd
@@ -47,6 +47,8 @@ signal location_scout_received(item_id, location_id, player, flags)
 func _init():
 	set_process_mode(Node.PROCESS_MODE_ALWAYS)
 
+	_ws.inbound_buffer_size = 8388608
+
 	global._print("Instantiated APClient")
 
 	# Read AP datapackages from file, if there are any
@@ -225,7 +227,7 @@ func _process(_delta):
 							error_message = "Unknown error."
 
 						_initiated_disconnect = true
-						_ws.disconnect_from_host()
+						_ws.close()
 
 						emit_signal("could_not_connect", error_message)
 						global._print("Connection to AP refused")
@@ -309,7 +311,7 @@ func connectToServer(server, un, pw):
 				% err
 			)
 		)
-		global._print("Could not connect to AP: " + err)
+		global._print("Could not connect to AP: %d" % err)
 		return
 	_should_process = true
 
diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd
index 8a15728..e38fc15 100644
--- a/client/Archipelago/manager.gd
+++ b/client/Archipelago/manager.gd
@@ -329,8 +329,8 @@ func _process_location_scout(item_id, location_id, player, flags):
 				collectable.setScoutedText(item_name)
 
 
-func _client_could_not_connect():
-	emit_signal("could_not_connect")
+func _client_could_not_connect(message):
+	emit_signal("could_not_connect", message)
 
 
 func _client_connect_status(message):
diff --git a/client/Archipelago/settings_screen.gd b/client/Archipelago/settings_screen.gd
index 14975e5..2236672 100644
--- a/client/Archipelago/settings_screen.gd
+++ b/client/Archipelago/settings_screen.gd
@@ -223,9 +223,12 @@ func connectionUnsuccessful(error_message):
 	popup.get_ok_button().visible = true
 	popup.popup_centered()
 
+	$Panel/connect_button.disabled = false
+
 
 func versionMismatchDeclined():
 	$Panel/AcceptDialog.hide()
+	$Panel/connect_button.disabled = false
 
 
 func historySelected(index):
-- 
cgit 1.4.1