From f1fdaef0cc43c63e3e8250c84c83855b184ddd58 Mon Sep 17 00:00:00 2001
From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date: Thu, 21 Oct 2021 13:32:22 +0100
Subject: [PATCH] Cleanup from multi instance PR

---
 SQL/paradise_schema.sql    |  2 +-
 SQL/updates/26-27.sql      |  2 +-
 code/datums/peer_server.dm | 32 --------------------------------
 config/example/config.toml |  1 -
 paradise.dme               |  1 -
 5 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 code/datums/peer_server.dm

diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
index 4931c2e0556..47d04aa39ce 100644
--- a/SQL/paradise_schema.sql
+++ b/SQL/paradise_schema.sql
@@ -625,7 +625,7 @@ CREATE TABLE `pai_saves` (
 CREATE TABLE `instance_data_cache` (
 	`server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`key_value` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
 	PRIMARY KEY (`server_id`, `key_name`) USING HASH
 ) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
diff --git a/SQL/updates/26-27.sql b/SQL/updates/26-27.sql
index b4931236600..cdc66928d91 100644
--- a/SQL/updates/26-27.sql
+++ b/SQL/updates/26-27.sql
@@ -4,7 +4,7 @@
 CREATE TABLE `instance_data_cache` (
 	`server_id` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`key_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`key_value` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`key_value` VARCHAR(12345) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`last_updated` TIMESTAMP NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
 	PRIMARY KEY (`server_id`, `key_name`) USING HASH
 ) COLLATE='utf8mb4_general_ci' ENGINE=MEMORY;
diff --git a/code/datums/peer_server.dm b/code/datums/peer_server.dm
deleted file mode 100644
index ed7abc97f6a..00000000000
--- a/code/datums/peer_server.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
-  * # Peer server
-  *
-  * This datum is essentially a model class to represent another instance of Paracode running
-  *
-  * It contains communications passes, an internal IP to communicate to, an external IP for players to connect to
-  *
-  */
-/datum/peer_server
-	// The following options will be loaded from configuration
-	/// Peer server internal IP, used for communications
-	var/internal_ip
-	/// Port of the server
-	var/server_port = 0
-	/// Comms key for this server
-	var/commskey
-
-	// The following options will be pulled from the peer at runtime
-	/// Peer server external IP, used for routing players around
-	var/external_ip
-	/// Peer server ID, used internally. Pulled from the peer on startup.
-	var/server_id
-	/// Peer server name, presented to players. Pulled from the peer on startup.
-	var/server_name
-	/// Have we done initial data discovery yet?
-	var/discovered = FALSE
-	/// Is the peer server online?
-	var/online = FALSE
-	/// Playercount of the peer server on last ping
-	var/playercount
-	/// Last world.time that an operation was attempted
-	var/last_operation_time = 0
diff --git a/config/example/config.toml b/config/example/config.toml
index b341021d4ec..a33c4555891 100644
--- a/config/example/config.toml
+++ b/config/example/config.toml
@@ -21,7 +21,6 @@
 # - gamemode_configuration
 # - gateway_configuration
 # - general_configuration
-# - instancing_configuration
 # - ipintel_configuration
 # - job_configuration
 # - logging_configuration
diff --git a/paradise.dme b/paradise.dme
index b7db391ce27..44f2ddc96ac 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -294,7 +294,6 @@
 #include "code\datums\mind.dm"
 #include "code\datums\mixed.dm"
 #include "code\datums\mutable_appearance.dm"
-#include "code\datums\peer_server.dm"
 #include "code\datums\periodic_news.dm"
 #include "code\datums\pipe_datums.dm"
 #include "code\datums\progressbar.dm"