Script: Fix incorrect kill method

2025-12-17 12:04:27 -06:00 · 2023-11-01 19:58:48 -07:00
458 changed files with 6091 additions and 8769 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,9 +17,3 @@
 [submodule "thirdparty/AccountManager"]
 	path = thirdparty/AccountManager
 	url = https://github.com/DarkflameUniverse/AccountManager
-[submodule "thirdparty/magic_enum"]
-	path = thirdparty/magic_enum
-	url = https://github.com/Neargye/magic_enum.git
-[submodule "thirdparty/kubernetes-client-c"]
-	path = thirdparty/kubernetes-client-c
-	url = https://github.com/kubernetes-client/c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.18)
 project(Darkflame)
 include(CTest)

-set(CMAKE_CXX_STANDARD 20)
+set (CMAKE_CXX_STANDARD 17)

 # Read variables from file
 FILE(READ "${CMAKE_SOURCE_DIR}/CMakeVariables.txt" variables)
@@ -28,13 +28,16 @@ foreach(variable ${variables})
 			# Set the variable
 			set(${variable_name} ${variable_value})

+			# Add compiler definition
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D${variable_name}=${variable_value}")
+
 			message(STATUS "Variable: ${variable_name} = ${variable_value}")
 		endif()
 	endif()
 endforeach()

 # Set the version
-set(PROJECT_VERSION "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\"")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

 # Echo the version
 message(STATUS "Version: ${PROJECT_VERSION}")
@@ -50,21 +53,19 @@ set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "" FORCE)
 # Disabled misleading indentation as DL_LinkedList from RakNet has a weird indent.
 # Disabled no-register
 # Disabled unknown pragmas because Linux doesn't understand Windows pragmas.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROJECT_VERSION=${PROJECT_VERSION}")
 if(UNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -fPIC")
-	add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0)
-	if(NOT APPLE)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs")
+	if(APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -fPIC")
+	else()
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -O2 -Wuninitialized -D_GLIBCXX_USE_CXX11_ABI=0 -D_GLIBCXX_USE_CXX17_ABI=0 -static-libgcc -fPIC -lstdc++fs")
 	endif()
-
-	if (${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	if (__dynamic AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
 	endif()
-
-	if (${GGDB})
+	if (__ggdb)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
 	endif()
-
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
 elseif(MSVC)
 	# Skip warning for invalid conversion from size_t to uint32_t for all targets below for now
@@ -153,7 +154,10 @@ if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
 endif()

 # Copy navmesh data on first build and extract it
-configure_file(${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip COPYONLY)
+configure_file(
+	${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
+	COPYONLY
+)

 file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
 file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
@@ -169,14 +173,24 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/dlu/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/dlu/*.sql)
 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
+		configure_file(
+			${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file}
+			COPYONLY
+		)
+	endif()
 endforeach()

 file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/cdserver/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/cdserver/*.sql)
 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
+	if (NOT EXISTS ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
+		configure_file(
+			${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file}
+			COPYONLY
+		)
+	endif()
 endforeach()

 # Create our list of include directories
@@ -184,9 +198,7 @@ set(INCLUDED_DIRECTORIES
 	"dCommon"
 	"dCommon/dClient"
 	"dCommon/dEnums"
-
 	"dChatFilter"
-
 	"dGame"
 	"dGame/dBehaviors"
 	"dGame/dComponents"
@@ -197,24 +209,13 @@ set(INCLUDED_DIRECTORIES
 	"dGame/dPropertyBehaviors"
 	"dGame/dPropertyBehaviors/ControlBehaviorMessages"
 	"dGame/dUtilities"
-
 	"dPhysics"
-
 	"dNavigation"
 	"dNavigation/dTerrain"
-
 	"dZoneManager"
-
 	"dDatabase"
-	"dDatabase/CDClientDatabase"
-	"dDatabase/CDClientDatabase/CDClientTables"
-	"dDatabase/GameDatabase"
-	"dDatabase/GameDatabase/ITables"
-	"dDatabase/GameDatabase/MySQL"
-	"dDatabase/GameDatabase/MySQL/Tables"
-
+	"dDatabase/Tables"
 	"dNet"
-
 	"dScripts"
 	"dScripts/02_server"
 	"dScripts/ai"
@@ -263,7 +264,6 @@ set(INCLUDED_DIRECTORIES
 	"dScripts/ai/GENERAL"
 	"dScripts/ai/GF"
 	"dScripts/ai/MINIGAME"
-	"dScripts/ai/MINIGAME/Objects"
 	"dScripts/ai/NP"
 	"dScripts/ai/NS"
 	"dScripts/ai/PETS"
@@ -287,7 +287,6 @@ set(INCLUDED_DIRECTORIES
 	"dScripts/zone/PROPERTY/GF"
 	"dScripts/zone/PROPERTY/NS"

-	"thirdparty/magic_enum/include/magic_enum"
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
 	"thirdparty/recastnavigation"
@@ -298,24 +297,28 @@ set(INCLUDED_DIRECTORIES
 	"tests/dCommonTests"
 	"tests/dGameTests"
 	"tests/dGameTests/dComponentsTests"
-)
+	)

 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
 if (APPLE)
 	include_directories("/usr/local/include/")
 endif()

+if (WIN32)
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt/include")
+elseif (UNIX)
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt")
+	set(INCLUDED_DIRECTORIES ${INCLUDED_DIRECTORIES} "thirdparty/libbcrypt/include/bcrypt")
+endif()
+
+# Add binary directory as an include directory
+include_directories(${PROJECT_BINARY_DIR})
+
 # Actually include the directories from our list
 foreach (dir ${INCLUDED_DIRECTORIES})
 	include_directories(${PROJECT_SOURCE_DIR}/${dir})
 endforeach()

-if (NOT WIN32)
-	include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt")
-endif()
-include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
-
-
 # Add linking directories:
 link_directories(${PROJECT_BINARY_DIR})

@@ -326,9 +329,8 @@ add_subdirectory(thirdparty)
 file(
 	GLOB HEADERS_DDATABASE
 	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/Tables/*.h
 	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
 )

@@ -365,13 +367,13 @@ add_subdirectory(dNavigation)
 add_subdirectory(dPhysics)

 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp")

 # Add platform specific common libraries
 if (UNIX)
 	set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "dl" "pthread")

-	if (NOT APPLE AND ${INCLUDE_BACKTRACE})
+	if (NOT APPLE AND __include_backtrace__)
 		set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "backtrace")
 	endif()
 endif()
@@ -409,6 +411,6 @@ target_precompile_headers(
 	"$<$<COMPILE_LANGUAGE:CXX>:${PROJECT_SOURCE_DIR}/thirdparty/tinyxml2/tinyxml2.h>"
 )

-if (${ENABLE_TESTING})
+if (${__enable_testing__} MATCHES "1")
 	add_subdirectory(tests)
 endif()
--- a/CMakeVariables.txt
+++ b/CMakeVariables.txt
@@ -1,32 +1,22 @@
 PROJECT_VERSION_MAJOR=1
 PROJECT_VERSION_MINOR=1
 PROJECT_VERSION_PATCH=1
-
+# LICENSE
+LICENSE=AGPL-3.0
 # Debugging
-# Set DYNAMIC to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
-DYNAMIC=1
-
-# Set GGDB to 1 to enable the -ggdb flag for the linker, including more debug info.
-# Do note, changing this will re-build the whole server
-GGDB=0
-
-# Set INCLUDE_BACKTRACE to 1 to includes the backtrace library for better crashlogs.
-# Do note, changing this will re-build the whole server
-INCLUDE_BACKTRACE=0
-
-# Set COMPILE_BACKTRACE to 1 to compile the backtrace library instead of using system libraries.
-# Do note, changing this will re-build the whole server
-COMPILE_BACKTRACE=0
-
+# Set __dynamic to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
+__dynamic=1
+# Set __ggdb to 1 to enable the -ggdb flag for the linker, including more debug info.
+# __ggdb=1
+# Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
+# __include_backtrace__=1
+# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
+# __compile_backtrace__=1
 # Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
-MARIADB_CONNECTOR_COMPILE_JOBS=1
-
+__maria_db_connector_compile_jobs__=1
 # When set to 1 and uncommented, compiling and linking testing folders and libraries will be done.
-ENABLE_TESTING=1
-
+__enable_testing__=1
 # The path to OpenSSL.  Change this if your OpenSSL install path is different than the default.
 OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3/
-
-# Whether or not to cache the entire CDClient Database into memory instead of lazy loading.
-# 0 means to lazy load, all other values mean load the entire database.
-CDCLIENT_CACHE_ALL=0
+# Uncomment the below line to cache the entire CDClient into memory
+# CDCLIENT_CACHE_ALL=1
--- a/README.md
+++ b/README.md
@@ -23,9 +23,6 @@ We do not recommend hosting public servers. Darkflame Universe is intended for s
 ### Supply of resource files
 Darkflame Universe is a server emulator and does not distribute any LEGO® Universe files. A separate game client is required to setup this server emulator and play the game, which we cannot supply. Users are strongly suggested to refer to the safe checksums listed [here](#verifying-your-client-files) to see if a client will work.

-## Step by step walkthrough for a single-player server
-If you would like a setup for a single player server only on a Windows machine, use the [Native Windows Setup Guide by HailStorm](https://gist.github.com/HailStorm32/169df65a47a104199b5cc57d10fa57de) and skip this README.
-
 ## Steps to setup server
 * [Clone this repository](#clone-the-repository)
 * [Install dependencies](#install-dependencies)
@@ -227,44 +224,6 @@ sudo setcap 'cap_net_bind_service=+ep' AuthServer
 ```
 and then go to `build/masterconfig.ini` and change `use_sudo_auth` to 0.

-### Linux Service
-If you are running this on a linux based system, it will use your terminal to run the program interactively, preventing you using it for other tasks and requiring it to be open to run the server.  
-_Note: You could use screen or tmux instead for virtual terminals_  
-To run the server non-interactively, we can use a systemctl service by copying the following file:  
-```shell
-cp ./systemd.example /etc/systemd/system/darkflame.service
-```  
-
-Make sure to edit the file in `/etc/systemd/system/darkflame.service` and change the:  
- `User` and `Group` to the user that runs the darkflame server.  
- `ExecPath` to the full file path of the server executable.  
-
-To register, enable and start the service use the following commands:
-
- Reload the systemd manager configuration to make it aware of the new service file:
-```shell
-systemctl daemon-reload
-```
- Start the service:
-```shell
-systemctl start darkflame.service
-```
- Enable OR disable the service to start on boot using:
-```shell
-systemctl enable darkflame.service
-systemctl disable darkflame.service
-```
- Verify that the service is running without errors:
-```shell
-systemctl status darkflame.service
-```
- You can also restart, stop, or check the logs of the service using journalctl
-```shell
-systemctl restart darkflame.service
-systemctl stop darkflame.service
-journalctl -xeu darkflame.service
-```
-
 ### First admin user
 Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!

@@ -326,7 +285,6 @@ Below are known good SHA256 checksums of the client:
 * `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)

 If the returned hash matches one of the lines above then you can continue with setting up the server. If you are using a fully downloaded and complete client from live, then it will work, but the hash above may not match. Otherwise you must obtain a full install of LEGO® Universe 1.10.64.
-You must also make absolutely sure your LEGO Universe client is not in a Windows OneDrive. DLU is not and will not support a client being stored in a OneDrive, so ensure you have moved the client outside of that location.

 ### Darkflame Universe Client
 Darkflame Universe clients identify themselves using a higher version number than the regular live clients out there.
--- a/dAuthServer/AuthServer.cpp
+++ b/dAuthServer/AuthServer.cpp
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <string>
 #include <ctime>
-#include <csignal>
 #include <chrono>
 #include <thread>

@@ -29,7 +28,7 @@ namespace Game {
 	Logger* logger = nullptr;
 	dServer* server = nullptr;
 	dConfig* config = nullptr;
-	Game::signal_t lastSignal = 0;
+	bool shouldShutdown = false;
 	std::mt19937 randomEngine;
 }

@@ -43,24 +42,27 @@ int main(int argc, char** argv) {
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();

-	std::signal(SIGINT, Game::OnSignal);
-	std::signal(SIGTERM, Game::OnSignal);
-
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
 	if (!Game::logger) return EXIT_FAILURE;

 	//Read our config:
-	Game::config = new dConfig("authconfig.ini");
+	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "authconfig.ini").string());
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");

 	LOG("Starting Auth server...");
-	LOG("Version: %s", PROJECT_VERSION);
+	LOG("Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
 	LOG("Compiled on: %s", __TIMESTAMP__);

+	//Connect to the MySQL Database
+	std::string mysql_host = Game::config->GetValue("mysql_host");
+	std::string mysql_database = Game::config->GetValue("mysql_database");
+	std::string mysql_username = Game::config->GetValue("mysql_username");
+	std::string mysql_password = Game::config->GetValue("mysql_password");
+
 	try {
-		Database::Connect();
+		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
 	} catch (sql::SQLException& ex) {
 		LOG("Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("AuthServer");
@@ -72,13 +74,15 @@ int main(int argc, char** argv) {
 	//Find out the master's IP:
 	std::string masterIP;
 	uint32_t masterPort = 1500;
-
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
+	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		masterIP = res->getString(1).c_str();
+		masterPort = res->getInt(2);
 	}
-	LOG("Master is at %s:%d", masterIP.c_str(), masterPort);
+
+	delete res;
+	delete stmt;

 	Game::randomEngine = std::mt19937(time(0));

@@ -88,7 +92,7 @@ int main(int argc, char** argv) {
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
 	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());

-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::lastSignal);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Auth, Game::config, &Game::shouldShutdown);

 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
@@ -99,18 +103,13 @@ int main(int argc, char** argv) {
 	uint32_t framesSinceMasterDisconnect = 0;
 	uint32_t framesSinceLastSQLPing = 0;

-	AuthPackets::LoadClaimCodes();
-	
-	Game::logger->Flush(); // once immediately before main loop
-	while (!Game::ShouldShutdown()) {
+	while (!Game::shouldShutdown) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;

-			if (framesSinceMasterDisconnect >= authFramerate) {
-				LOG("No connection to master!");
+			if (framesSinceMasterDisconnect >= authFramerate)
 				break; //Exit our loop, shut down.
-			}
 		} else framesSinceMasterDisconnect = 0;

 		//In world we'd update our other systems here.
@@ -135,12 +134,16 @@ int main(int argc, char** argv) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
 			uint32_t masterPort;
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
+			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+			auto res = stmt->executeQuery();
+			while (res->next()) {
+				masterIP = res->getString(1).c_str();
+				masterPort = res->getInt(2);
 			}

+			delete res;
+			delete stmt;
+
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;

@@ -149,7 +152,6 @@ int main(int argc, char** argv) {
 		std::this_thread::sleep_until(t);
 	}

-	LOG("Exited Main Loop! (signal %d)", Game::lastSignal);
 	//Delete our objects here:
 	Database::Destroy("AuthServer");
 	delete Game::server;
--- a/dAuthServer/CMakeLists.txt
+++ b/dAuthServer/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_executable(AuthServer "AuthServer.cpp")
 target_link_libraries(AuthServer ${COMMON_LIBRARIES})
-add_compile_definitions(AuthServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
--- a/dChatFilter/dChatFilter.cpp
+++ b/dChatFilter/dChatFilter.cpp
@@ -32,11 +32,15 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 	}

 	//Read player names that are ok as well:
-	auto approvedNames = Database::Get()->GetApprovedCharacterNames();
-	for (auto& name : approvedNames) {
-		std::transform(name.begin(), name.end(), name.begin(), ::tolower); //Transform to lowercase
-		m_ApprovedWords.push_back(CalculateHash(name));
+	auto stmt = Database::CreatePreppedStmt("select name from charinfo;");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		std::string line = res->getString(1).c_str();
+		std::transform(line.begin(), line.end(), line.begin(), ::tolower); //Transform to lowercase
+		m_ApprovedWords.push_back(CalculateHash(line));
 	}
+	delete res;
+	delete stmt;
 }

 dChatFilter::~dChatFilter() {
@@ -140,7 +144,7 @@ std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}

-		position += originalSegment.length() + 1;
+		position += segment.length() + 1;
 	}

 	return listOfBadSegments;
--- a/dChatServer/CMakeLists.txt
+++ b/dChatServer/CMakeLists.txt
@@ -1,12 +1,10 @@
 set(DCHATSERVER_SOURCES
-	"ChatIgnoreList.cpp"
 	"ChatPacketHandler.cpp"
 	"PlayerContainer.cpp"
 )

 add_executable(ChatServer "ChatServer.cpp")
 add_library(dChatServer ${DCHATSERVER_SOURCES})
-add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")

 target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
 target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer)
--- a/dChatServer/ChatIgnoreList.cpp
+++ b/dChatServer/ChatIgnoreList.cpp
@@ -1,173 +0,0 @@
-#include "ChatIgnoreList.h"
-#include "PlayerContainer.h"
-#include "eChatInternalMessageType.h"
-#include "BitStreamUtils.h"
-#include "PacketUtils.h"
-#include "Game.h"
-#include "Logger.h"
-#include "eObjectBits.h"
-
-#include "Database.h"
-
-// A note to future readers, The client handles all the actual ignoring logic:
-// not allowing teams, rejecting DMs, friends requets etc.
-// The only thing not auto-handled is instance activities force joining the team on the server.
-
-void WriteOutgoingReplyHeader(RakNet::BitStream& bitStream, const LWOOBJID& receivingPlayer, const ChatIgnoreList::Response type) {
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT_INTERNAL, eChatInternalMessageType::ROUTE_TO_PLAYER);
-	bitStream.Write(receivingPlayer);
-
-	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, type);
-}
-
-void ChatIgnoreList::GetIgnoreList(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	if (!receiver->ignoredPlayers.empty()) {
-		LOG_DEBUG("Player %llu already has an ignore list", playerId);
-		return;
-	}
-
-	auto ignoreList = Database::Get()->GetIgnoreList(static_cast<uint32_t>(playerId));
-	if (ignoreList.empty()) {
-		LOG_DEBUG("Player %llu has no ignores", playerId);
-		return;
-	}
-
-	for (auto& ignoredPlayer : ignoreList) {
-		receiver->ignoredPlayers.push_back(IgnoreData{ ignoredPlayer.id, ignoredPlayer.name });
-		GeneralUtils::SetBit(receiver->ignoredPlayers.back().playerId, eObjectBits::CHARACTER);
-		GeneralUtils::SetBit(receiver->ignoredPlayers.back().playerId, eObjectBits::PERSISTENT);
-	}
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::GET_IGNORE);
-
-	bitStream.Write<uint8_t>(false); // Probably is Is Free Trial, but we don't care about that
-	bitStream.Write<uint16_t>(0); // literally spacing due to struct alignment
-
-	bitStream.Write<uint16_t>(receiver->ignoredPlayers.size());
-	for (const auto& ignoredPlayer : receiver->ignoredPlayers) {
-		bitStream.Write(ignoredPlayer.playerId);
-		bitStream.Write(LUWString(ignoredPlayer.playerName, 36));
-	}
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}
-
-void ChatIgnoreList::AddIgnore(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	constexpr int32_t MAX_IGNORES = 32;
-	if (receiver->ignoredPlayers.size() > MAX_IGNORES) {
-		LOG_DEBUG("Player %llu has too many ignores", playerId);
-		return;
-	}
-
-	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
-
-	LUWString toIgnoreName(33);
-	inStream.Read(toIgnoreName);
-	std::string toIgnoreStr = toIgnoreName.GetAsString();
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::ADD_IGNORE);
-
-	// Check if the player exists
-	LWOOBJID ignoredPlayerId = LWOOBJID_EMPTY;
-	if (toIgnoreStr == receiver->playerName || toIgnoreStr.find("[GM]") == 0) {
-		LOG_DEBUG("Player %llu tried to ignore themselves", playerId);
-
-		bitStream.Write(ChatIgnoreList::AddResponse::GENERAL_ERROR);
-	} else if (std::count(receiver->ignoredPlayers.begin(), receiver->ignoredPlayers.end(), toIgnoreStr) > 0) {
-		LOG_DEBUG("Player %llu is already ignoring %s", playerId, toIgnoreStr.c_str());
-
-		bitStream.Write(ChatIgnoreList::AddResponse::ALREADY_IGNORED);
-	} else {
-		// Get the playerId falling back to query if not online
-		auto* playerData = Game::playerContainer.GetPlayerData(toIgnoreStr);
-		if (!playerData) {
-			// Fall back to query
-			auto player = Database::Get()->GetCharacterInfo(toIgnoreStr);
-			if (!player || player->name != toIgnoreStr) {
-				LOG_DEBUG("Player %s not found", toIgnoreStr.c_str());
-			} else {
-				ignoredPlayerId = player->id;
-			}
-		} else {
-			ignoredPlayerId = playerData->playerID;
-		}
-
-		if (ignoredPlayerId != LWOOBJID_EMPTY) {
-			Database::Get()->AddIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(ignoredPlayerId));
-			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::CHARACTER);
-			GeneralUtils::SetBit(ignoredPlayerId, eObjectBits::PERSISTENT);
-
-			receiver->ignoredPlayers.push_back(IgnoreData{ ignoredPlayerId, toIgnoreStr });
-			LOG_DEBUG("Player %llu is ignoring %s", playerId, toIgnoreStr.c_str());
-
-			bitStream.Write(ChatIgnoreList::AddResponse::SUCCESS);
-		} else {
-			bitStream.Write(ChatIgnoreList::AddResponse::PLAYER_NOT_FOUND);
-		}
-	}
-
-	LUWString playerNameSend(toIgnoreStr, 33);
-	bitStream.Write(playerNameSend);
-	bitStream.Write(ignoredPlayerId);
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}
-
-void ChatIgnoreList::RemoveIgnore(Packet* packet) {
-	CINSTREAM_SKIP_HEADER;
-	LWOOBJID playerId;
-	inStream.Read(playerId);
-
-	auto* receiver = Game::playerContainer.GetPlayerData(playerId);
-	if (!receiver) {
-		LOG("Tried to get ignore list, but player %llu not found in container", playerId);
-		return;
-	}
-
-	inStream.IgnoreBytes(4); // ignore some garbage zeros idk
-
-	LUWString removedIgnoreName(33);
-	inStream.Read(removedIgnoreName);
-	std::string removedIgnoreStr = removedIgnoreName.GetAsString();
-
-	auto toRemove = std::remove(receiver->ignoredPlayers.begin(), receiver->ignoredPlayers.end(), removedIgnoreStr);
-	if (toRemove == receiver->ignoredPlayers.end()) {
-		LOG_DEBUG("Player %llu is not ignoring %s", playerId, removedIgnoreStr.c_str());
-		return;
-	}
-
-	Database::Get()->RemoveIgnore(static_cast<uint32_t>(playerId), static_cast<uint32_t>(toRemove->playerId));
-	receiver->ignoredPlayers.erase(toRemove, receiver->ignoredPlayers.end());
-
-	CBITSTREAM;
-	WriteOutgoingReplyHeader(bitStream, receiver->playerID, ChatIgnoreList::Response::REMOVE_IGNORE);
-
-	bitStream.Write<int8_t>(0);
-	LUWString playerNameSend(removedIgnoreStr, 33);
-	bitStream.Write(playerNameSend);
-
-	Game::server->Send(&bitStream, packet->systemAddress, false);
-}
--- a/dChatServer/ChatIgnoreList.h
+++ b/dChatServer/ChatIgnoreList.h
@@ -1,27 +0,0 @@
-#ifndef __CHATIGNORELIST__H__
-#define __CHATIGNORELIST__H__
-
-struct Packet;
-
-#include <cstdint>
-
-namespace ChatIgnoreList {
-	void GetIgnoreList(Packet* packet);
-	void AddIgnore(Packet* packet);
-	void RemoveIgnore(Packet* packet);
-
-	enum class Response : uint8_t {
-		ADD_IGNORE = 32,
-		REMOVE_IGNORE = 33,
-		GET_IGNORE = 34,
-	};
-
-	enum class AddResponse : uint8_t {
-		SUCCESS,
-		ALREADY_IGNORED,
-		PLAYER_NOT_FOUND,
-		GENERAL_ERROR,
-	};
-};
-
-#endif  //!__CHATIGNORELIST__H__
--- a/dChatServer/ChatPacketHandler.cpp
+++ b/dChatServer/ChatPacketHandler.cpp
@@ -19,29 +19,46 @@
 #include "eClientMessageType.h"
 #include "eGameMessageType.h"

+extern PlayerContainer playerContainer;
+
 void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	//Get from the packet which player we want to do something with:
 	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = 0;
 	inStream.Read(playerID);

-	auto player = Game::playerContainer.GetPlayerData(playerID);
+	auto player = playerContainer.GetPlayerData(playerID);
 	if (!player) return;

-	auto friendsList = Database::Get()->GetFriendsList(playerID);
-	for (const auto& friendData : friendsList) {
+	//Get our friends list from the Db.  Using a derived table since the friend of a player can be in either column.
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt(
+		"SELECT fr.requested_player, best_friend, ci.name FROM "
+		"(SELECT CASE "
+		"WHEN player_id = ? THEN friend_id "
+		"WHEN friend_id = ? THEN player_id "
+		"END AS requested_player, best_friend FROM friends) AS fr "
+		"JOIN charinfo AS ci ON ci.id = fr.requested_player "
+		"WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;"));
+	stmt->setUInt(1, static_cast<uint32_t>(playerID));
+	stmt->setUInt(2, static_cast<uint32_t>(playerID));
+	stmt->setUInt(3, static_cast<uint32_t>(playerID));
+
+	std::vector<FriendData> friends;
+
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
 		FriendData fd;
 		fd.isFTP = false; // not a thing in DLU
-		fd.friendID = friendData.friendID;
+		fd.friendID = res->getUInt(1);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::PERSISTENT);
 		GeneralUtils::SetBit(fd.friendID, eObjectBits::CHARACTER);

-		fd.isBestFriend = friendData.isBestFriend; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
+		fd.isBestFriend = res->getInt(2) == 3; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
 		if (fd.isBestFriend) player->countOfBestFriends += 1;
-		fd.friendName = friendData.friendName;
+		fd.friendName = res->getString(3);

 		//Now check if they're online:
-		auto fr = Game::playerContainer.GetPlayerData(fd.friendID);
+		auto fr = playerContainer.GetPlayerData(fd.friendID);

 		if (fr) {
 			fd.isOnline = true;
@@ -54,7 +71,7 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 			fd.zoneID = LWOZONEID();
 		}

-		player->friends.push_back(fd);
+		friends.push_back(fd);
 	}

 	//Now, we need to send the friendlist to the server they came from:
@@ -66,17 +83,22 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GET_FRIENDS_LIST_RESPONSE);
 	bitStream.Write<uint8_t>(0);
 	bitStream.Write<uint16_t>(1); //Length of packet -- just writing one as it doesn't matter, client skips it.
-	bitStream.Write<uint16_t>(player->friends.size());
+	bitStream.Write((uint16_t)friends.size());

-	for (auto& data : player->friends) {
+	for (auto& data : friends) {
 		data.Serialize(bitStream);
 	}

+	player->friends = friends;
+
 	SystemAddress sysAddr = player->sysAddr;
 	SEND_PACKET;
 }

 void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
+	auto maxNumberOfBestFriendsAsString = Game::config->GetValue("max_number_of_best_friends");
+	// If this config option doesn't exist, default to 5 which is what live used.
+	auto maxNumberOfBestFriends = maxNumberOfBestFriendsAsString != "" ? std::stoi(maxNumberOfBestFriendsAsString) : 5U;
 	CINSTREAM_SKIP_HEADER;
 	LWOOBJID requestorPlayerID;
 	inStream.Read(requestorPlayerID);
@@ -95,7 +117,7 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	char isBestFriendRequest{};
 	inStream.Read(isBestFriendRequest);

-	auto requestor = Game::playerContainer.GetPlayerData(requestorPlayerID);
+	auto requestor = playerContainer.GetPlayerData(requestorPlayerID);
 	if (!requestor) {
 		LOG("No requestor player %llu sent to %s found.", requestorPlayerID, playerName.c_str());
 		return;
@@ -105,7 +127,7 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 		SendFriendResponse(requestor, requestor, eAddFriendResponseType::MYTHRAN);
 		return;
 	};
-	std::unique_ptr<PlayerData> requestee(Game::playerContainer.GetPlayerData(playerName));
+	std::unique_ptr<PlayerData> requestee(playerContainer.GetPlayerData(playerName));

 	// Check if player is online first
 	if (isBestFriendRequest && !requestee) {
@@ -133,26 +155,35 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	// If at this point we dont have a target, then they arent online and we cant send the request.
 	// Send the response code that corresponds to what the error is.
 	if (!requestee) {
+		std::unique_ptr<sql::PreparedStatement> nameQuery(Database::CreatePreppedStmt("SELECT name from charinfo where name = ?;"));
+		nameQuery->setString(1, playerName);
+		std::unique_ptr<sql::ResultSet> result(nameQuery->executeQuery());
+
 		requestee.reset(new PlayerData());
 		requestee->playerName = playerName;
-		auto responseType = Database::Get()->GetCharacterInfo(playerName)
-			? eAddFriendResponseType::NOTONLINE
-			: eAddFriendResponseType::INVALIDCHARACTER;

-		SendFriendResponse(requestor, requestee.get(), responseType);
+		SendFriendResponse(requestor, requestee.get(), result->next() ? eAddFriendResponseType::NOTONLINE : eAddFriendResponseType::INVALIDCHARACTER);
 		return;
 	}

 	if (isBestFriendRequest) {
+		std::unique_ptr<sql::PreparedStatement> friendUpdate(Database::CreatePreppedStmt("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+		friendUpdate->setUInt(1, static_cast<uint32_t>(requestorPlayerID));
+		friendUpdate->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+		friendUpdate->setUInt(4, static_cast<uint32_t>(requestorPlayerID));
+		std::unique_ptr<sql::ResultSet> result(friendUpdate->executeQuery());

+		LWOOBJID queryPlayerID = LWOOBJID_EMPTY;
+		LWOOBJID queryFriendID = LWOOBJID_EMPTY;
 		uint8_t oldBestFriendStatus{};
 		uint8_t bestFriendStatus{};
-		auto bestFriendInfo = Database::Get()->GetBestFriendStatus(requestorPlayerID, requestee->playerID);
-		if (bestFriendInfo) {
+
+		if (result->next()) {
 			// Get the IDs
-			LWOOBJID queryPlayerID = bestFriendInfo->playerCharacterId;
-			LWOOBJID queryFriendID = bestFriendInfo->friendCharacterId;
-			oldBestFriendStatus = bestFriendInfo->bestFriendStatus;
+			queryPlayerID = result->getInt(1);
+			queryFriendID = result->getInt(2);
+			oldBestFriendStatus = result->getInt(3);
 			bestFriendStatus = oldBestFriendStatus;

 			// Set the bits
@@ -173,17 +204,22 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {

 		// Only do updates if there was a change in the bff status.
 		if (oldBestFriendStatus != bestFriendStatus) {
-			auto maxBestFriends = Game::playerContainer.GetMaxNumberOfBestFriends();
-			if (requestee->countOfBestFriends >= maxBestFriends || requestor->countOfBestFriends >= maxBestFriends) {
-				if (requestee->countOfBestFriends >= maxBestFriends) {
+			if (requestee->countOfBestFriends >= maxNumberOfBestFriends || requestor->countOfBestFriends >= maxNumberOfBestFriends) {
+				if (requestee->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
 				}
-				if (requestor->countOfBestFriends >= maxBestFriends) {
+				if (requestor->countOfBestFriends >= maxNumberOfBestFriends) {
 					SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
 				}
 			} else {
 				// Then update the database with this new info.
-				Database::Get()->SetBestFriendStatus(requestorPlayerID, requestee->playerID, bestFriendStatus);
+				std::unique_ptr<sql::PreparedStatement> updateQuery(Database::CreatePreppedStmt("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+				updateQuery->setUInt(1, bestFriendStatus);
+				updateQuery->setUInt(2, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->setUInt(3, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(4, static_cast<uint32_t>(requestee->playerID));
+				updateQuery->setUInt(5, static_cast<uint32_t>(requestorPlayerID));
+				updateQuery->executeUpdate();
 				// Sent the best friend update here if the value is 3
 				if (bestFriendStatus == 3U) {
 					requestee->countOfBestFriends += 1;
@@ -206,15 +242,8 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 			if (requestor->sysAddr != UNASSIGNED_SYSTEM_ADDRESS) SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::WAITINGAPPROVAL, true, true);
 		}
 	} else {
-		auto maxFriends = Game::playerContainer.GetMaxNumberOfFriends();
-		if (requestee->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::THEIRFRIENDLISTFULL, false);
-		} else if (requestor->friends.size() >= maxFriends) {
-			SendFriendResponse(requestor, requestee.get(), eAddFriendResponseType::YOURFRIENDSLISTFULL, false);
-		} else {
-			// Do not send this if we are requesting to be a best friend.
-			SendFriendRequest(requestee.get(), requestor);
-		}
+		// Do not send this if we are requesting to be a best friend.
+		SendFriendRequest(requestee.get(), requestor);
 	}

 	// If the player is actually a player and not a ghost one defined above, release it from being deleted.
@@ -230,8 +259,8 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 	std::string friendName = PacketUtils::ReadString(0x15, packet, true);

 	//Now to try and find both of these:
-	auto requestor = Game::playerContainer.GetPlayerData(playerID);
-	auto requestee = Game::playerContainer.GetPlayerData(friendName);
+	auto requestor = playerContainer.GetPlayerData(playerID);
+	auto requestee = playerContainer.GetPlayerData(friendName);
 	if (!requestor || !requestee) return;

 	eAddFriendResponseType serverResponseCode{};
@@ -285,7 +314,11 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 		requesteeData.isOnline = true;
 		requestor->friends.push_back(requesteeData);

-		Database::Get()->AddFriend(requestor->playerID, requestee->playerID);
+		std::unique_ptr<sql::PreparedStatement> statement(Database::CreatePreppedStmt("INSERT IGNORE INTO `friends` (`player_id`, `friend_id`, `best_friend`) VALUES (?,?,?);"));
+		statement->setUInt(1, static_cast<uint32_t>(requestor->playerID));
+		statement->setUInt(2, static_cast<uint32_t>(requestee->playerID));
+		statement->setInt(3, 0);
+		statement->execute();
 	}

 	if (serverResponseCode != eAddFriendResponseType::DECLINED) SendFriendResponse(requestor, requestee, serverResponseCode, isAlreadyBestFriends);
@@ -300,20 +333,28 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {

 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
 	//First, we need to find their ID:
+	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt("SELECT id FROM charinfo WHERE name=? LIMIT 1;"));
+	stmt->setString(1, friendName.c_str());
+
 	LWOOBJID friendID = 0;
-	auto friendIdResult = Database::Get()->GetCharacterInfo(friendName);
-	if (friendIdResult) {
-		friendID = friendIdResult->id;
+	std::unique_ptr<sql::ResultSet> res(stmt->executeQuery());
+	while (res->next()) {
+		friendID = res->getUInt(1);
 	}

 	// Convert friendID to LWOOBJID
 	GeneralUtils::SetBit(friendID, eObjectBits::PERSISTENT);
 	GeneralUtils::SetBit(friendID, eObjectBits::CHARACTER);

-	Database::Get()->RemoveFriend(playerID, friendID);
+	std::unique_ptr<sql::PreparedStatement> deletestmt(Database::CreatePreppedStmt("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;"));
+	deletestmt->setUInt(1, static_cast<uint32_t>(playerID));
+	deletestmt->setUInt(2, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(3, static_cast<uint32_t>(friendID));
+	deletestmt->setUInt(4, static_cast<uint32_t>(playerID));
+	deletestmt->execute();

 	//Now, we need to send an update to notify the sender (and possibly, receiver) that their friendship has been ended:
-	auto goonA = Game::playerContainer.GetPlayerData(playerID);
+	auto goonA = playerContainer.GetPlayerData(playerID);
 	if (goonA) {
 		// Remove the friend from our list of friends
 		for (auto friendData = goonA->friends.begin(); friendData != goonA->friends.end(); friendData++) {
@@ -326,7 +367,7 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 		SendRemoveFriend(goonA, friendName, true);
 	}

-	auto goonB = Game::playerContainer.GetPlayerData(friendID);
+	auto goonB = playerContainer.GetPlayerData(friendID);
 	if (!goonB) return;
 	// Do it again for other person
 	for (auto friendData = goonB->friends.begin(); friendData != goonB->friends.end(); friendData++) {
@@ -337,7 +378,7 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 		}
 	}

-	std::string goonAName = GeneralUtils::UTF16ToWTF8(Game::playerContainer.GetName(playerID));
+	std::string goonAName = GeneralUtils::UTF16ToWTF8(playerContainer.GetName(playerID));
 	SendRemoveFriend(goonB, goonAName, true);
 }

@@ -346,11 +387,11 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);

-	auto* sender = Game::playerContainer.GetPlayerData(playerID);
+	auto* sender = playerContainer.GetPlayerData(playerID);

 	if (sender == nullptr) return;

-	if (Game::playerContainer.GetIsMuted(sender)) return;
+	if (playerContainer.GetIsMuted(sender)) return;

 	const auto senderName = std::string(sender->playerName.c_str());

@@ -365,12 +406,12 @@ void ChatPacketHandler::HandleChatMessage(Packet* packet) {

 	if (channel != 8) return;

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	if (team == nullptr) return;

 	for (const auto memberId : team->memberIDs) {
-		auto* otherMember = Game::playerContainer.GetPlayerData(memberId);
+		auto* otherMember = playerContainer.GetPlayerData(memberId);

 		if (otherMember == nullptr) return;

@@ -404,11 +445,11 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 	std::string message = PacketUtils::ReadString(0xAA, packet, true, 512);

 	//Get the bois:
-	auto goonA = Game::playerContainer.GetPlayerData(senderID);
-	auto goonB = Game::playerContainer.GetPlayerData(receiverName);
+	auto goonA = playerContainer.GetPlayerData(senderID);
+	auto goonB = playerContainer.GetPlayerData(receiverName);
 	if (!goonA || !goonB) return;

-	if (Game::playerContainer.GetIsMuted(goonA)) return;
+	if (playerContainer.GetIsMuted(goonA)) return;

 	std::string goonAName = goonA->playerName.c_str();
 	std::string goonBName = goonB->playerName.c_str();
@@ -466,25 +507,25 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 	inStream.Read(playerID);
 	std::string invitedPlayer = PacketUtils::ReadString(0x14, packet, true);

-	auto* player = Game::playerContainer.GetPlayerData(playerID);
+	auto* player = playerContainer.GetPlayerData(playerID);

 	if (player == nullptr) {
 		return;
 	}

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	if (team == nullptr) {
-		team = Game::playerContainer.CreateTeam(playerID);
+		team = playerContainer.CreateTeam(playerID);
 	}

-	auto* other = Game::playerContainer.GetPlayerData(invitedPlayer);
+	auto* other = playerContainer.GetPlayerData(invitedPlayer);

 	if (other == nullptr) {
 		return;
 	}

-	if (Game::playerContainer.GetTeam(other->playerID) != nullptr) {
+	if (playerContainer.GetTeam(other->playerID) != nullptr) {
 		return;
 	}

@@ -517,12 +558,12 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 		return;
 	}

-	auto* team = Game::playerContainer.GetTeam(leaderID);
+	auto* team = playerContainer.GetTeam(leaderID);

 	if (team == nullptr) {
 		LOG("Failed to find team for leader (%llu)", leaderID);

-		team = Game::playerContainer.GetTeam(playerID);
+		team = playerContainer.GetTeam(playerID);
 	}

 	if (team == nullptr) {
@@ -530,7 +571,7 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 		return;
 	}

-	Game::playerContainer.AddMember(team, playerID);
+	playerContainer.AddMember(team, playerID);
 }

 void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
@@ -540,12 +581,12 @@ void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
 	uint32_t size = 0;
 	inStream.Read(size);

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	LOG("(%llu) leaving team", playerID);

 	if (team != nullptr) {
-		Game::playerContainer.RemoveMember(team, playerID, false, false, true);
+		playerContainer.RemoveMember(team, playerID, false, false, true);
 	}
 }

@@ -558,24 +599,24 @@ void ChatPacketHandler::HandleTeamKick(Packet* packet) {

 	LOG("(%llu) kicking (%s) from team", playerID, kickedPlayer.c_str());

-	auto* kicked = Game::playerContainer.GetPlayerData(kickedPlayer);
+	auto* kicked = playerContainer.GetPlayerData(kickedPlayer);

 	LWOOBJID kickedId = LWOOBJID_EMPTY;

 	if (kicked != nullptr) {
 		kickedId = kicked->playerID;
 	} else {
-		kickedId = Game::playerContainer.GetId(GeneralUtils::UTF8ToUTF16(kickedPlayer));
+		kickedId = playerContainer.GetId(GeneralUtils::UTF8ToUTF16(kickedPlayer));
 	}

 	if (kickedId == LWOOBJID_EMPTY) return;

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	if (team != nullptr) {
 		if (team->leaderID != playerID || team->leaderID == kickedId) return;

-		Game::playerContainer.RemoveMember(team, kickedId, false, true, false);
+		playerContainer.RemoveMember(team, kickedId, false, true, false);
 	}
 }

@@ -588,16 +629,16 @@ void ChatPacketHandler::HandleTeamPromote(Packet* packet) {

 	LOG("(%llu) promoting (%s) to team leader", playerID, promotedPlayer.c_str());

-	auto* promoted = Game::playerContainer.GetPlayerData(promotedPlayer);
+	auto* promoted = playerContainer.GetPlayerData(promotedPlayer);

 	if (promoted == nullptr) return;

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	if (team != nullptr) {
 		if (team->leaderID != playerID) return;

-		Game::playerContainer.PromoteMember(team, promoted->playerID);
+		playerContainer.PromoteMember(team, promoted->playerID);
 	}
 }

@@ -611,16 +652,16 @@ void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
 	char option;
 	inStream.Read(option);

-	auto* team = Game::playerContainer.GetTeam(playerID);
+	auto* team = playerContainer.GetTeam(playerID);

 	if (team != nullptr) {
 		if (team->leaderID != playerID) return;

 		team->lootFlag = option;

-		Game::playerContainer.TeamStatusUpdate(team);
+		playerContainer.TeamStatusUpdate(team);

-		Game::playerContainer.UpdateTeamsOnWorld(team, false);
+		playerContainer.UpdateTeamsOnWorld(team, false);
 	}
 }

@@ -629,18 +670,18 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);

-	auto* team = Game::playerContainer.GetTeam(playerID);
-	auto* data = Game::playerContainer.GetPlayerData(playerID);
+	auto* team = playerContainer.GetTeam(playerID);
+	auto* data = playerContainer.GetPlayerData(playerID);

 	if (team != nullptr && data != nullptr) {
 		if (team->local && data->zoneID.GetMapID() != team->zoneId.GetMapID() && data->zoneID.GetCloneID() != team->zoneId.GetCloneID()) {
-			Game::playerContainer.RemoveMember(team, playerID, false, false, true, true);
+			playerContainer.RemoveMember(team, playerID, false, false, true, true);

 			return;
 		}

 		if (team->memberIDs.size() <= 1 && !team->local) {
-			Game::playerContainer.DisbandTeam(team);
+			playerContainer.DisbandTeam(team);

 			return;
 		}
@@ -651,16 +692,16 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 			ChatPacketHandler::SendTeamSetLeader(data, LWOOBJID_EMPTY);
 		}

-		Game::playerContainer.TeamStatusUpdate(team);
+		playerContainer.TeamStatusUpdate(team);

 		const auto leaderName = GeneralUtils::UTF8ToUTF16(data->playerName);

 		for (const auto memberId : team->memberIDs) {
-			auto* otherMember = Game::playerContainer.GetPlayerData(memberId);
+			auto* otherMember = playerContainer.GetPlayerData(memberId);

 			if (memberId == playerID) continue;

-			const auto memberName = Game::playerContainer.GetName(memberId);
+			const auto memberName = playerContainer.GetName(memberId);

 			if (otherMember != nullptr) {
 				ChatPacketHandler::SendTeamSetOffWorldFlag(otherMember, data->playerID, data->zoneID);
@@ -668,7 +709,7 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 			ChatPacketHandler::SendTeamAddPlayer(data, false, team->local, false, memberId, memberName, otherMember != nullptr ? otherMember->zoneID : LWOZONEID(0, 0, 0));
 		}

-		Game::playerContainer.UpdateTeamsOnWorld(team, false);
+		playerContainer.UpdateTeamsOnWorld(team, false);
 	}
 }

@@ -705,7 +746,7 @@ void ChatPacketHandler::SendTeamInviteConfirm(PlayerData* receiver, bool bLeader
 	bitStream.Write(ucLootFlag);
 	bitStream.Write(ucNumOfOtherPlayers);
 	bitStream.Write(ucResponseCode);
-	bitStream.Write<uint32_t>(wsLeaderName.size());
+	bitStream.Write(static_cast<uint32_t>(wsLeaderName.size()));
 	for (const auto character : wsLeaderName) {
 		bitStream.Write(character);
 	}
@@ -730,7 +771,7 @@ void ChatPacketHandler::SendTeamStatus(PlayerData* receiver, LWOOBJID i64LeaderI
 	bitStream.Write<uint32_t>(0); // BinaryBuffe, no clue what's in here
 	bitStream.Write(ucLootFlag);
 	bitStream.Write(ucNumOfOtherPlayers);
-	bitStream.Write<uint32_t>(wsLeaderName.size());
+	bitStream.Write(static_cast<uint32_t>(wsLeaderName.size()));
 	for (const auto character : wsLeaderName) {
 		bitStream.Write(character);
 	}
@@ -771,7 +812,7 @@ void ChatPacketHandler::SendTeamAddPlayer(PlayerData* receiver, bool bIsFreeTria
 	bitStream.Write(bLocal);
 	bitStream.Write(bNoLootOnDeath);
 	bitStream.Write(i64PlayerID);
-	bitStream.Write<uint32_t>(wsPlayerName.size());
+	bitStream.Write(static_cast<uint32_t>(wsPlayerName.size()));
 	for (const auto character : wsPlayerName) {
 		bitStream.Write(character);
 	}
@@ -802,7 +843,7 @@ void ChatPacketHandler::SendTeamRemovePlayer(PlayerData* receiver, bool bDisband
 	bitStream.Write(bLocal);
 	bitStream.Write(i64LeaderID);
 	bitStream.Write(i64PlayerID);
-	bitStream.Write<uint32_t>(wsPlayerName.size());
+	bitStream.Write(static_cast<uint32_t>(wsPlayerName.size()));
 	for (const auto character : wsPlayerName) {
 		bitStream.Write(character);
 	}
--- a/dChatServer/ChatServer.cpp
+++ b/dChatServer/ChatServer.cpp
@@ -19,7 +19,6 @@
 #include "eChatMessageType.h"
 #include "eChatInternalMessageType.h"
 #include "eWorldMessageType.h"
-#include "ChatIgnoreList.h"

 #include "Game.h"

@@ -33,14 +32,16 @@ namespace Game {
 	dConfig* config = nullptr;
 	dChatFilter* chatFilter = nullptr;
 	AssetManager* assetManager = nullptr;
-	Game::signal_t lastSignal = 0;
+	bool shouldShutdown = false;
 	std::mt19937 randomEngine;
-	PlayerContainer playerContainer;
 }

+
 Logger* SetupLogger();
 void HandlePacket(Packet* packet);

+PlayerContainer playerContainer;
+
 int main(int argc, char** argv) {
 	constexpr uint32_t chatFramerate = mediumFramerate;
 	constexpr uint32_t chatFrameDelta = mediumFrameDelta;
@@ -48,20 +49,17 @@ int main(int argc, char** argv) {
 	Diagnostics::SetProcessFileName(argv[0]);
 	Diagnostics::Initialize();

-	std::signal(SIGINT, Game::OnSignal);
-	std::signal(SIGTERM, Game::OnSignal);
-
 	//Create all the objects we need to run our service:
 	Game::logger = SetupLogger();
 	if (!Game::logger) return EXIT_FAILURE;

 	//Read our config:
-	Game::config = new dConfig("chatconfig.ini");
+	Game::config = new dConfig((BinaryPathFinder::GetBinaryDir() / "chatconfig.ini").string());
 	Game::logger->SetLogToConsole(Game::config->GetValue("log_to_console") != "0");
 	Game::logger->SetLogDebugStatements(Game::config->GetValue("log_debug_statements") == "1");

 	LOG("Starting Chat server...");
-	LOG("Version: %s", PROJECT_VERSION);
+	LOG("Version: %i.%i", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
 	LOG("Compiled on: %s", __TIMESTAMP__);

 	try {
@@ -80,8 +78,13 @@ int main(int argc, char** argv) {
 	}

 	//Connect to the MySQL Database
+	std::string mysql_host = Game::config->GetValue("mysql_host");
+	std::string mysql_database = Game::config->GetValue("mysql_database");
+	std::string mysql_username = Game::config->GetValue("mysql_username");
+	std::string mysql_password = Game::config->GetValue("mysql_password");
+
 	try {
-		Database::Connect();
+		Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
 	} catch (sql::SQLException& ex) {
 		LOG("Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("ChatServer");
@@ -93,25 +96,28 @@ int main(int argc, char** argv) {
 	//Find out the master's IP:
 	std::string masterIP;
 	uint32_t masterPort = 1000;
-	auto masterInfo = Database::Get()->GetMasterInfo();
-	if (masterInfo) {
-		masterIP = masterInfo->ip;
-		masterPort = masterInfo->port;
+	sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+	auto res = stmt->executeQuery();
+	while (res->next()) {
+		masterIP = res->getString(1).c_str();
+		masterPort = res->getInt(2);
 	}
+
+	delete res;
+	delete stmt;
+
 	//It's safe to pass 'localhost' here, as the IP is only used as the external IP.
 	uint32_t maxClients = 50;
 	uint32_t ourPort = 1501;
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
 	if (Game::config->GetValue("port") != "") ourPort = std::atoi(Game::config->GetValue("port").c_str());

-	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::lastSignal);
+	Game::server = new dServer(Game::config->GetValue("external_ip"), ourPort, 0, maxClients, false, true, Game::logger, masterIP, masterPort, ServerType::Chat, Game::config, &Game::shouldShutdown);

 	Game::chatFilter = new dChatFilter(Game::assetManager->GetResPath().string() + "/chatplus_en_us", bool(std::stoi(Game::config->GetValue("dont_generate_dcf"))));
 	
 	Game::randomEngine = std::mt19937(time(0));

-	Game::playerContainer.Initialize();
-
 	//Run it until server gets a kill message from Master:
 	auto t = std::chrono::high_resolution_clock::now();
 	Packet* packet = nullptr;
@@ -121,8 +127,7 @@ int main(int argc, char** argv) {
 	uint32_t framesSinceMasterDisconnect = 0;
 	uint32_t framesSinceLastSQLPing = 0;

-	Game::logger->Flush(); // once immediately before main loop
-	while (!Game::ShouldShutdown()) {
+	while (!Game::shouldShutdown) {
 		//Check if we're still connected to master:
 		if (!Game::server->GetIsConnectedToMaster()) {
 			framesSinceMasterDisconnect++;
@@ -153,13 +158,16 @@ int main(int argc, char** argv) {
 			//Find out the master's IP for absolutely no reason:
 			std::string masterIP;
 			uint32_t masterPort;
-
-			auto masterInfo = Database::Get()->GetMasterInfo();
-			if (masterInfo) {
-				masterIP = masterInfo->ip;
-				masterPort = masterInfo->port;
+			sql::PreparedStatement* stmt = Database::CreatePreppedStmt("SELECT ip, port FROM servers WHERE name='master';");
+			auto res = stmt->executeQuery();
+			while (res->next()) {
+				masterIP = res->getString(1).c_str();
+				masterPort = res->getInt(2);
 			}

+			delete res;
+			delete stmt;
+
 			framesSinceLastSQLPing = 0;
 		} else framesSinceLastSQLPing++;

@@ -203,19 +211,19 @@ void HandlePacket(Packet* packet) {
 	if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT_INTERNAL) {
 		switch (static_cast<eChatInternalMessageType>(packet->data[3])) {
 		case eChatInternalMessageType::PLAYER_ADDED_NOTIFICATION:
-			Game::playerContainer.InsertPlayer(packet);
+			playerContainer.InsertPlayer(packet);
 			break;

 		case eChatInternalMessageType::PLAYER_REMOVED_NOTIFICATION:
-			Game::playerContainer.RemovePlayer(packet);
+			playerContainer.RemovePlayer(packet);
 			break;

 		case eChatInternalMessageType::MUTE_UPDATE:
-			Game::playerContainer.MuteUpdate(packet);
+			playerContainer.MuteUpdate(packet);
 			break;

 		case eChatInternalMessageType::CREATE_TEAM:
-			Game::playerContainer.CreateTeamServer(packet);
+			playerContainer.CreateTeamServer(packet);
 			break;

 		case eChatInternalMessageType::ANNOUNCEMENT: {
@@ -237,15 +245,7 @@ void HandlePacket(Packet* packet) {
 			break;

 		case eChatMessageType::GET_IGNORE_LIST:
-			ChatIgnoreList::GetIgnoreList(packet);
-			break;
-
-		case eChatMessageType::ADD_IGNORE:
-			ChatIgnoreList::AddIgnore(packet);
-			break;
-
-		case eChatMessageType::REMOVE_IGNORE:
-			ChatIgnoreList::RemoveIgnore(packet);
+			LOG("Asked for ignore list, but is unimplemented right now.");
 			break;

 		case eChatMessageType::TEAM_GET_STATUS:
--- a/dChatServer/PlayerContainer.cpp
+++ b/dChatServer/PlayerContainer.cpp
@@ -13,13 +13,11 @@
 #include "ChatPackets.h"
 #include "dConfig.h"

-void PlayerContainer::Initialize() {
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_best_friends"), m_MaxNumberOfBestFriends);
-	GeneralUtils::TryParse<uint32_t>(Game::config->GetValue("max_number_of_friends"), m_MaxNumberOfFriends);
+PlayerContainer::PlayerContainer() {
 }

 PlayerContainer::~PlayerContainer() {
-	m_Players.clear();
+	mPlayers.clear();
 }

 TeamData::TeamData() {
@@ -43,12 +41,19 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	inStream.Read(data->muteExpire);
 	data->sysAddr = packet->systemAddress;

-	m_Names[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);
+	mNames[data->playerID] = GeneralUtils::UTF8ToUTF16(data->playerName);

-	m_Players.insert(std::make_pair(data->playerID, data));
+	mPlayers.insert(std::make_pair(data->playerID, data));
 	LOG("Added user: %s (%llu), zone: %i", data->playerName.c_str(), data->playerID, data->zoneID.GetMapID());

-	Database::Get()->UpdateActivityLog(data->playerID, eActivityType::PlayerLoggedIn, data->zoneID.GetMapID());
+	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
+
+	insertLog->setInt(1, data->playerID);
+	insertLog->setInt(2, 0);
+	insertLog->setUInt64(3, time(nullptr));
+	insertLog->setInt(4, data->zoneID.GetMapID());
+
+	insertLog->executeUpdate();
 }

 void PlayerContainer::RemovePlayer(Packet* packet) {
@@ -83,9 +88,16 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 	}

 	LOG("Removed user: %llu", playerID);
-	m_Players.erase(playerID);
+	mPlayers.erase(playerID);

-	Database::Get()->UpdateActivityLog(playerID, eActivityType::PlayerLoggedOut, player->zoneID.GetMapID());
+	auto* insertLog = Database::CreatePreppedStmt("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);");
+
+	insertLog->setInt(1, playerID);
+	insertLog->setInt(2, 1);
+	insertLog->setUInt64(3, time(nullptr));
+	insertLog->setInt(4, player->zoneID.GetMapID());
+
+	insertLog->executeUpdate();
 }

 void PlayerContainer::MuteUpdate(Packet* packet) {
@@ -179,7 +191,7 @@ TeamData* PlayerContainer::CreateLocalTeam(std::vector<LWOOBJID> members) {
 TeamData* PlayerContainer::CreateTeam(LWOOBJID leader, bool local) {
 	auto* team = new TeamData();

-	team->teamID = ++m_TeamIDCounter;
+	team->teamID = ++mTeamIDCounter;
 	team->leaderID = leader;
 	team->local = local;

@@ -354,7 +366,7 @@ void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {

 	if (!deleteTeam) {
 		bitStream.Write(team->lootFlag);
-		bitStream.Write<char>(team->memberIDs.size());
+		bitStream.Write(static_cast<char>(team->memberIDs.size()));
 		for (const auto memberID : team->memberIDs) {
 			bitStream.Write(memberID);
 		}
@@ -364,15 +376,15 @@ void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 }

 std::u16string PlayerContainer::GetName(LWOOBJID playerID) {
-	const auto& pair = m_Names.find(playerID);
+	const auto& pair = mNames.find(playerID);

-	if (pair == m_Names.end()) return u"";
+	if (pair == mNames.end()) return u"";

 	return pair->second;
 }

 LWOOBJID PlayerContainer::GetId(const std::u16string& playerName) {
-	for (const auto& pair : m_Names) {
+	for (const auto& pair : mNames) {
 		if (pair.second == playerName) {
 			return pair.first;
 		}
--- a/dChatServer/PlayerContainer.h
+++ b/dChatServer/PlayerContainer.h
@@ -7,26 +7,12 @@
 #include "dServer.h"
 #include <unordered_map>

-struct IgnoreData {
-	inline bool operator==(const std::string& other) const noexcept {
-		return playerName == other;
-	}
-
-	inline bool operator==(const LWOOBJID& other) const noexcept {
-		return playerId == other;
-	}
-
-	LWOOBJID playerId;
-	std::string playerName;
-};
-
 struct PlayerData {
 	LWOOBJID playerID;
 	std::string playerName;
 	SystemAddress sysAddr;
 	LWOZONEID zoneID;
 	std::vector<FriendData> friends;
-	std::vector<IgnoreData> ignoredPlayers;
 	time_t muteExpire;
 	uint8_t countOfBestFriends = 0;
 };
@@ -43,9 +29,9 @@ struct TeamData {

 class PlayerContainer {
 public:
+	PlayerContainer();
 	~PlayerContainer();

-	void Initialize();
 	void InsertPlayer(Packet* packet);
 	void RemovePlayer(Packet* packet);
 	void MuteUpdate(Packet* packet);
@@ -53,13 +39,13 @@ public:
 	void BroadcastMuteUpdate(LWOOBJID player, time_t time);

 	PlayerData* GetPlayerData(const LWOOBJID& playerID) {
-		auto it = m_Players.find(playerID);
-		if (it != m_Players.end()) return it->second;
+		auto it = mPlayers.find(playerID);
+		if (it != mPlayers.end()) return it->second;
 		return nullptr;
 	}

 	PlayerData* GetPlayerData(const std::string& playerName) {
-		for (auto player : m_Players) {
+		for (auto player : mPlayers) {
 			if (player.second) {
 				std::string pn = player.second->playerName.c_str();
 				if (pn == playerName) return player.second;
@@ -81,17 +67,13 @@ public:
 	std::u16string GetName(LWOOBJID playerID);
 	LWOOBJID GetId(const std::u16string& playerName);
 	bool GetIsMuted(PlayerData* data);
-	uint32_t GetMaxNumberOfBestFriends() { return m_MaxNumberOfBestFriends; }
-	uint32_t GetMaxNumberOfFriends() { return m_MaxNumberOfFriends; }

-	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return m_Players; }
+	std::map<LWOOBJID, PlayerData*>& GetAllPlayerData() { return mPlayers; }

 private:
-	LWOOBJID m_TeamIDCounter = 0;
-	std::map<LWOOBJID, PlayerData*> m_Players;
+	LWOOBJID mTeamIDCounter = 0;
+	std::map<LWOOBJID, PlayerData*> mPlayers;
 	std::vector<TeamData*> mTeams;
-	std::unordered_map<LWOOBJID, std::u16string> m_Names;
-	uint32_t m_MaxNumberOfBestFriends = 5;
-	uint32_t m_MaxNumberOfFriends = 50;
+	std::unordered_map<LWOOBJID, std::u16string> mNames;
 };

--- a/dCommon/AmfSerialize.cpp
+++ b/dCommon/AmfSerialize.cpp
@@ -54,17 +54,17 @@ void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
 * RakNet writes in the correct byte order - do not reverse this.
 */
 void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
-	unsigned char b4 = static_cast<unsigned char>(v);
+	unsigned char b4 = (unsigned char)v;
 	if (v < 0x00200000) {
 		b4 = b4 & 0x7F;
 		if (v > 0x7F) {
 			unsigned char b3;
 			v = v >> 7;
-			b3 = static_cast<unsigned char>(v) | 0x80;
+			b3 = ((unsigned char)(v)) | 0x80;
 			if (v > 0x7F) {
 				unsigned char b2;
 				v = v >> 7;
-				b2 = static_cast<unsigned char>(v) | 0x80;
+				b2 = ((unsigned char)(v)) | 0x80;
 				bs->Write(b2);
 			}

@@ -76,11 +76,11 @@ void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
 		unsigned char b3;

 		v = v >> 8;
-		b3 = static_cast<unsigned char>(v) | 0x80;
+		b3 = ((unsigned char)(v)) | 0x80;
 		v = v >> 7;
-		b2 = static_cast<unsigned char>(v) | 0x80;
+		b2 = ((unsigned char)(v)) | 0x80;
 		v = v >> 7;
-		b1 = static_cast<unsigned char>(v) | 0x80;
+		b1 = ((unsigned char)(v)) | 0x80;

 		bs->Write(b1);
 		bs->Write(b2);
@@ -105,8 +105,8 @@ void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
 * RakNet writes in the correct byte order - do not reverse this.
 */
 void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
-	WriteFlagNumber(bs, static_cast<uint32_t>(str.size()));
-	bs->Write(str.c_str(), static_cast<uint32_t>(str.size()));
+	WriteFlagNumber(bs, (uint32_t)str.size());
+	bs->Write(str.c_str(), (uint32_t)str.size());
 }

 /**
--- a/dCommon/BinaryIO.cpp
+++ b/dCommon/BinaryIO.cpp
@@ -1,6 +1,14 @@
 #include "BinaryIO.h"
 #include <string>

+void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outstream) {
+	//BinaryWrite(outstream, uint32_t(stringToWrite.length()));
+
+	for (size_t i = 0; i < size_t(stringToWrite.length()); ++i) {
+		BinaryIO::BinaryWrite(outstream, stringToWrite[i]);
+	}
+}
+
 //For reading null-terminated strings
 std::string BinaryIO::ReadString(std::istream& instream) {
 	std::string toReturn;
@@ -15,3 +23,36 @@ std::string BinaryIO::ReadString(std::istream& instream) {

 	return toReturn;
 }
+
+//For reading strings of a specific size
+std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
+	std::string toReturn;
+	char buffer;
+
+	for (size_t i = 0; i < size; ++i) {
+		BinaryIO::BinaryRead(instream, buffer);
+		toReturn += buffer;
+	}
+
+	return toReturn;
+}
+
+std::string BinaryIO::ReadWString(std::istream& instream) {
+	size_t size;
+	BinaryRead(instream, size);
+	//toReturn.resize(size);
+	std::string test;
+	unsigned char buf;
+
+	for (size_t i = 0; i < size; ++i) {
+		//instream.ignore(1);
+		BinaryRead(instream, buf);
+		test += buf;
+	}
+
+	//printf("%s\n", test.c_str());
+
+	//instream.read((char*)&toReturn[0], size * 2);
+	//std::string str(toReturn.begin(), toReturn.end());
+	return test;
+}
--- a/dCommon/BinaryIO.h
+++ b/dCommon/BinaryIO.h
@@ -1,17 +1,8 @@
 #pragma once
-
-#ifndef __BINARYIO__H__
-#define __BINARYIO__H__
-
 #include <iostream>
 #include <fstream>
-#include <string>
-
-#include "Game.h"
-#include "Logger.h"

 namespace BinaryIO {
-
 	template<typename T>
 	std::ostream& BinaryWrite(std::ostream& stream, const T& value) {
 		return stream.write(reinterpret_cast<const char*>(&value), sizeof(T));
@@ -24,51 +15,13 @@ namespace BinaryIO {
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}

-	enum class ReadType : int8_t {
-		WideString = 0,
-		String = 1,
-	};
-
-	template<typename SizeType>
-	inline void ReadString(std::istream& stream, std::u16string& value) {
-		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
-
-		SizeType size;
-		BinaryRead(stream, size);
-
-		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
-		value.resize(size);
-		stream.read(reinterpret_cast<char*>(value.data()), size * sizeof(uint16_t));
-	}
-
-	template<typename SizeType>
-	inline void ReadString(std::istream& stream, std::string& value, ReadType readType) {
-		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
-
-		SizeType size;
-		BinaryRead(stream, size);
-
-		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
-		value.resize(size);
-		if (readType == ReadType::WideString) {
-			uint16_t wideChar;
-
-			// Faster to do this than to read a u16string and convert it to a string since we only go through allocator once
-			for (SizeType i = 0; i < size; ++i) {
-				BinaryRead(stream, wideChar);
-				value[i] = static_cast<char>(wideChar);
-			}
-		} else {
-			stream.read(value.data(), size);
-		}
-	}
-
+	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
 	std::string ReadString(std::istream& instream);
+	std::string ReadString(std::istream& instream, size_t size);
+	std::string ReadWString(std::istream& instream);

 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());
 		return f.good();
 	}
 }
-
-#endif  //!__BINARYIO__H__
--- a/dCommon/BrickByBrickFix.cpp
+++ b/dCommon/BrickByBrickFix.cpp
@@ -13,8 +13,9 @@

 //! Forward declarations

+std::unique_ptr<sql::ResultSet> GetModelsFromDatabase();
 void WriteSd0Magic(char* input, uint32_t chunkSize);
-bool CheckSd0Magic(std::istream& streamToCheck);
+bool CheckSd0Magic(sql::Blob* streamToCheck);

 /**
 * @brief Truncates all models with broken data from the database.
@@ -23,24 +24,28 @@ bool CheckSd0Magic(std::istream& streamToCheck);
 */
 uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 	uint32_t modelsTruncated{};
-	auto modelsToTruncate = Database::Get()->GetAllUgcModels();
-	bool previousCommitValue = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToTruncate) {
+	auto modelsToTruncate = GetModelsFromDatabase();
+	bool previousCommitValue = Database::GetAutoCommit();
+	Database::SetAutoCommit(false);
+	while (modelsToTruncate->next()) {
+		std::unique_ptr<sql::PreparedStatement> ugcModelToDelete(Database::CreatePreppedStmt("DELETE FROM ugc WHERE ugc.id = ?;"));
+		std::unique_ptr<sql::PreparedStatement> pcModelToDelete(Database::CreatePreppedStmt("DELETE FROM properties_contents WHERE ugc_id = ?;"));
 		std::string completeUncompressedModel{};
 		uint32_t chunkCount{};
+		uint64_t modelId = modelsToTruncate->getInt(1);
+		std::unique_ptr<sql::Blob> modelAsSd0(modelsToTruncate->getBlob(2));
 		// Check that header is sd0 by checking for the sd0 magic.
-		if (CheckSd0Magic(model.lxfmlData)) {
+		if (CheckSd0Magic(modelAsSd0.get())) {
 			while (true) {
 				uint32_t chunkSize{};
-				model.lxfmlData.read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream
+				modelAsSd0->read(reinterpret_cast<char*>(&chunkSize), sizeof(uint32_t)); // Extract chunk size from istream

 				// Check if good here since if at the end of an sd0 file, this will have eof flagged.
-				if (!model.lxfmlData.good()) break;
+				if (!modelAsSd0->good()) break;

 				std::unique_ptr<uint8_t[]> compressedChunk(new uint8_t[chunkSize]);
 				for (uint32_t i = 0; i < chunkSize; i++) {
-					compressedChunk[i] = model.lxfmlData.get();
+					compressedChunk[i] = modelAsSd0->get();
 				}

 				// Ignore the valgrind warning about uninitialized values.  These are discarded later when we know the actual uncompressed size.
@@ -51,10 +56,10 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {

 				if (actualUncompressedSize != -1) {
 					uint32_t previousSize = completeUncompressedModel.size();
-					completeUncompressedModel.append(reinterpret_cast<char*>(uncompressedChunk.get()));
+					completeUncompressedModel.append((char*)uncompressedChunk.get());
 					completeUncompressedModel.resize(previousSize + actualUncompressedSize);
 				} else {
-					LOG("Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, model.id, err);
+					LOG("Failed to inflate chunk %i for model %llu.  Error: %i", chunkCount, modelId, err);
 					break;
 				}
 				chunkCount++;
@@ -70,20 +75,26 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 					"</LXFML>",
 					completeUncompressedModel.length() >= 15 ? completeUncompressedModel.length() - 15 : 0) == std::string::npos
 					) {
-					LOG("Brick-by-brick model %llu will be deleted!", model.id);
-					Database::Get()->DeleteUgcModelData(model.id);
+					LOG("Brick-by-brick model %llu will be deleted!", modelId);
+					ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+					ugcModelToDelete->execute();
+					pcModelToDelete->execute();
 					modelsTruncated++;
 				}
 			}
 		} else {
-			LOG("Brick-by-brick model %llu will be deleted!", model.id);
-			Database::Get()->DeleteUgcModelData(model.id);
+			LOG("Brick-by-brick model %llu will be deleted!", modelId);
+			ugcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			pcModelToDelete->setInt64(1, modelsToTruncate->getInt64(1));
+			ugcModelToDelete->execute();
+			pcModelToDelete->execute();
 			modelsTruncated++;
 		}
 	}

-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousCommitValue);
+	Database::Commit();
+	Database::SetAutoCommit(previousCommitValue);
 	return modelsTruncated;
 }

@@ -95,17 +106,21 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 */
 uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
 	uint32_t updatedModels = 0;
-	auto modelsToUpdate = Database::Get()->GetAllUgcModels();
-	auto previousAutoCommitState = Database::Get()->GetAutoCommit();
-	Database::Get()->SetAutoCommit(false);
-	for (auto& model : modelsToUpdate) {
+	auto modelsToUpdate = GetModelsFromDatabase();
+	auto previousAutoCommitState = Database::GetAutoCommit();
+	Database::SetAutoCommit(false);
+	std::unique_ptr<sql::PreparedStatement> insertionStatement(Database::CreatePreppedStmt("UPDATE ugc SET lxfml = ? WHERE id = ?;"));
+	while (modelsToUpdate->next()) {
+		int64_t modelId = modelsToUpdate->getInt64(1);
+		std::unique_ptr<sql::Blob> oldLxfml(modelsToUpdate->getBlob(2));
 		// Check if the stored blob starts with zlib magic (0x78 0xDA - best compression of zlib)
 		// If it does, convert it to sd0.
-		if (model.lxfmlData.get() == 0x78 && model.lxfmlData.get() == 0xDA) {
+		if (oldLxfml->get() == 0x78 && oldLxfml->get() == 0xDA) {
+
 			// Get and save size of zlib compressed chunk.
-			model.lxfmlData.seekg(0, std::ios::end);
-			uint32_t oldLxfmlSize = static_cast<uint32_t>(model.lxfmlData.tellg());
-			model.lxfmlData.seekg(0);
+			oldLxfml->seekg(0, std::ios::end);
+			uint32_t oldLxfmlSize = static_cast<uint32_t>(oldLxfml->tellg());
+			oldLxfml->seekg(0);

 			// Allocate 9 extra bytes.  5 for sd0 magic, 4 for the only zlib compressed size.
 			uint32_t oldLxfmlSizeWithHeader = oldLxfmlSize + 9;
@@ -113,27 +128,34 @@ uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {

 			WriteSd0Magic(sd0ConvertedModel.get(), oldLxfmlSize);
 			for (uint32_t i = 9; i < oldLxfmlSizeWithHeader; i++) {
-				sd0ConvertedModel.get()[i] = model.lxfmlData.get();
+				sd0ConvertedModel.get()[i] = oldLxfml->get();
 			}

 			std::string outputString(sd0ConvertedModel.get(), oldLxfmlSizeWithHeader);
 			std::istringstream outputStringStream(outputString);

+			insertionStatement->setBlob(1, static_cast<std::istream*>(&outputStringStream));
+			insertionStatement->setInt64(2, modelId);
 			try {
-				Database::Get()->UpdateUgcModelData(model.id, outputStringStream);
-				LOG("Updated model %i to sd0", model.id);
+				insertionStatement->executeUpdate();
+				LOG("Updated model %i to sd0", modelId);
 				updatedModels++;
 			} catch (sql::SQLException exception) {
 				LOG("Failed to update model %i.  This model should be inspected manually to see why."
-					"The database error is %s", model.id, exception.what());
+					"The database error is %s", modelId, exception.what());
 			}
 		}
 	}
-	Database::Get()->Commit();
-	Database::Get()->SetAutoCommit(previousAutoCommitState);
+	Database::Commit();
+	Database::SetAutoCommit(previousAutoCommitState);
 	return updatedModels;
 }

+std::unique_ptr<sql::ResultSet> GetModelsFromDatabase() {
+	std::unique_ptr<sql::PreparedStatement> modelsRawDataQuery(Database::CreatePreppedStmt("SELECT id, lxfml FROM ugc;"));
+	return std::unique_ptr<sql::ResultSet>(modelsRawDataQuery->executeQuery());
+}
+
 /**
 * @brief Writes sd0 magic at the front of a char*
 *
@@ -149,6 +171,6 @@ void WriteSd0Magic(char* input, uint32_t chunkSize) {
 	*reinterpret_cast<uint32_t*>(input + 5) = chunkSize; // Write the integer to the character array
 }

-bool CheckSd0Magic(std::istream& streamToCheck) {
-	return streamToCheck.get() == 's' && streamToCheck.get() == 'd' && streamToCheck.get() == '0' && streamToCheck.get() == 0x01 && streamToCheck.get() == 0xFF;
+bool CheckSd0Magic(sql::Blob* streamToCheck) {
+	return streamToCheck->get() == 's' && streamToCheck->get() == 'd' && streamToCheck->get() == '0' && streamToCheck->get() == 0x01 && streamToCheck->get() == 0xFF;
 }
--- a/dCommon/CMakeLists.txt
+++ b/dCommon/CMakeLists.txt
@@ -5,7 +5,6 @@ set(DCOMMON_SOURCES
 		"dConfig.cpp"
 		"Diagnostics.cpp"
 		"Logger.cpp"
-		"Game.cpp"
 		"GeneralUtils.cpp"
 		"LDFFormat.cpp"
 		"MD5.cpp"
--- a/dCommon/Diagnostics.cpp
+++ b/dCommon/Diagnostics.cpp
@@ -71,7 +71,7 @@ LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e) {
 #include <cstring>
 #include <exception>

-#if defined(INCLUDE_BACKTRACE)
+#if defined(__include_backtrace__)
 #include <backtrace.h>

 #include <backtrace-supported.h>
@@ -115,15 +115,7 @@ void GenerateDump() {
 }

 void CatchUnhandled(int sig) {
-	std::exception_ptr eptr = std::current_exception();
-	try {
-		if (eptr) std::rethrow_exception(eptr);
-	} catch(const std::exception& e) {
-		LOG("Caught exception: '%s'", e.what());
-	}
-	Game::logger->Flush();
-
-#ifndef INCLUDE_BACKTRACE
+#ifndef __include_backtrace__

 	std::string fileName = Diagnostics::GetOutDirectory() + "crash_" + Diagnostics::GetProcessName() + "_" + std::to_string(getpid()) + ".log";
 	LOG("Encountered signal %i, creating crash dump %s", sig, fileName.c_str());
@@ -175,7 +167,7 @@ void CatchUnhandled(int sig) {
 	backtrace_symbols_fd(array, size, STDOUT_FILENO);
 #  endif // defined(__GNUG__)

-#else // INCLUDE_BACKTRACE
+#else // __include_backtrace__

 	struct backtrace_state* state = backtrace_create_state(
 		Diagnostics::GetProcessFileName().c_str(),
@@ -186,8 +178,8 @@ void CatchUnhandled(int sig) {
 	struct bt_ctx ctx = { state, 0 };
 	Bt(state);

-#endif // INCLUDE_BACKTRACE
-	Game::logger->Flush();
+#endif // __include_backtrace__
+
 	exit(EXIT_FAILURE);
 }

@@ -205,10 +197,10 @@ void MakeBacktrace() {
 	sigact.sa_sigaction = CritErrHdlr;
 	sigact.sa_flags = SA_RESTART | SA_SIGINFO;

-	if (sigaction(SIGSEGV, &sigact, nullptr) != 0 ||
-		sigaction(SIGFPE, &sigact, nullptr) != 0 ||
-		sigaction(SIGABRT, &sigact, nullptr) != 0 ||
-		sigaction(SIGILL, &sigact, nullptr) != 0) {
+	if (sigaction(SIGSEGV, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGFPE, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGABRT, &sigact, (struct sigaction*)nullptr) != 0 ||
+		sigaction(SIGILL, &sigact, (struct sigaction*)nullptr) != 0) {
 		fprintf(stderr, "error setting signal handler for %d (%s)\n",
 			SIGSEGV,
 			strsignal(SIGSEGV));
--- a/dCommon/FdbToSqlite.cpp
+++ b/dCommon/FdbToSqlite.cpp
@@ -28,17 +28,19 @@ FdbToSqlite::Convert::Convert(std::string binaryOutPath) {
 	this->m_BinaryOutPath = binaryOutPath;
 }

-bool FdbToSqlite::Convert::ConvertDatabase(AssetStream& buffer) {
+bool FdbToSqlite::Convert::ConvertDatabase(AssetMemoryBuffer& buffer) {
 	if (m_ConversionStarted) return false;

+	std::istream cdClientBuffer(&buffer);
+
 	this->m_ConversionStarted = true;
 	try {
 		CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite");

 		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");

-		int32_t numberOfTables = ReadInt32(buffer);
-		ReadTables(numberOfTables, buffer);
+		int32_t numberOfTables = ReadInt32(cdClientBuffer);
+		ReadTables(numberOfTables, cdClientBuffer);

 		CDClientDatabase::ExecuteQuery("COMMIT;");
 	} catch (CppSQLite3Exception& e) {
--- a/dCommon/FdbToSqlite.h
+++ b/dCommon/FdbToSqlite.h
@@ -7,7 +7,7 @@
 #include <iosfwd>
 #include <map>

-#include "AssetManager.h"
+class AssetMemoryBuffer;

 enum class eSqliteDataType : int32_t;

@@ -27,7 +27,7 @@ namespace FdbToSqlite {
 		 * 
 		 * @return true if the database was converted properly, false otherwise. 
 		 */
-		bool ConvertDatabase(AssetStream& buffer);
+		bool ConvertDatabase(AssetMemoryBuffer& buffer);

 		/**
 		 * @brief Reads a 32 bit int from the fdb file.
--- a/dCommon/Game.cpp
+++ b/dCommon/Game.cpp
@@ -1,7 +0,0 @@
-#include "Game.h"
-
-namespace Game {
-	void OnSignal(int signal) {
-		lastSignal = signal;
-	}
-}
--- a/dCommon/Game.h
+++ b/dCommon/Game.h
@@ -1,8 +1,6 @@
 #pragma once

-#include <string>
 #include <random>
-#include <csignal>

 class dServer;
 class Logger;
@@ -14,10 +12,8 @@ class AssetManager;
 struct SystemAddress;
 class EntityManager;
 class dZoneManager;
-class PlayerContainer;

 namespace Game {
-	using signal_t = volatile std::sig_atomic_t;
 	extern Logger* logger;
 	extern dServer* server;
 	extern InstanceManager* im;
@@ -27,14 +23,7 @@ namespace Game {
 	extern RakPeerInterface* chatServer;
 	extern AssetManager* assetManager;
 	extern SystemAddress chatSysAddr;
-	extern signal_t lastSignal;
+	extern bool shouldShutdown;
 	extern EntityManager* entityManager;
 	extern dZoneManager* zoneManager;
-	extern PlayerContainer playerContainer;
-	extern std::string projectVersion;
-
-	inline bool ShouldShutdown() {
-		return lastSignal != 0;
-	}
-	void OnSignal(int signal);
 }
--- a/dCommon/GeneralUtils.cpp
+++ b/dCommon/GeneralUtils.cpp
@@ -53,7 +53,7 @@ bool _IsSuffixChar(uint8_t c) {
 bool GeneralUtils::_NextUTF8Char(std::string_view& slice, uint32_t& out) {
 	size_t rem = slice.length();
 	if (slice.empty()) return false;
-	const uint8_t* bytes = reinterpret_cast<const uint8_t*>(&slice.front());
+	const uint8_t* bytes = (const uint8_t*)&slice.front();
 	if (rem > 0) {
 		uint8_t first = bytes[0];
 		if (first < 0x80) { // 1 byte character
--- a/dCommon/GeneralUtils.h
+++ b/dCommon/GeneralUtils.h
@@ -151,11 +151,6 @@ namespace GeneralUtils {
 		return std::stod(value);
 	}

-	template <>
-	inline uint16_t Parse(const char* value) {
-		return std::stoul(value);
-	}
-
 	template <>
 	inline uint32_t Parse(const char* value) {
 		return std::stoul(value);
@@ -234,30 +229,18 @@ namespace GeneralUtils {
 		return T();
 	}

-	/**
-	 * Casts the value of an enum entry to its underlying type
-	 * @param entry Enum entry to cast
-	 * @returns The enum entry's value in its underlying type
-	*/
-	template <typename eType>
-	inline constexpr typename std::underlying_type_t<eType> CastUnderlyingType(const eType entry) {
-		static_assert(std::is_enum_v<eType>, "Not an enum");
-
-		return static_cast<typename std::underlying_type_t<eType>>(entry);
-	}
-
-	// on Windows we need to undef these or else they conflict with our numeric limits calls
-	// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
-	#ifdef _WIN32
-	#undef min
-	#undef max
-	#endif
+// on Windows we need to undef these or else they conflict with our numeric limits calls
+// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
+#ifdef _WIN32
+#undef min
+#undef max
+#endif

 	template <typename T>
 	inline T GenerateRandomNumber() {
 		// Make sure it is a numeric type
 		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-
+		
 		return GenerateRandomNumber<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
 	}
 }
--- a/dCommon/LDFFormat.h
+++ b/dCommon/LDFFormat.h
@@ -63,15 +63,15 @@ private:

 	//! Writes the key to the packet
 	void WriteKey(RakNet::BitStream* packet) {
-		packet->Write<uint8_t>(this->key.length() * sizeof(uint16_t));
+		packet->Write(static_cast<uint8_t>(this->key.length() * sizeof(uint16_t)));
 		for (uint32_t i = 0; i < this->key.length(); ++i) {
-			packet->Write<uint16_t>(this->key[i]);
+			packet->Write(static_cast<uint16_t>(this->key[i]));
 		}
 	}

 	//! Writes the value to the packet
 	void WriteValue(RakNet::BitStream* packet) {
-		packet->Write<uint8_t>(this->GetValueType());
+		packet->Write(static_cast<uint8_t>(this->GetValueType()));
 		packet->Write(this->value);
 	}

@@ -179,30 +179,30 @@ template<> inline eLDFType LDFData<std::string>::GetValueType(void) { return LDF
 // The specialized version for std::u16string (UTF-16)
 template<>
 inline void LDFData<std::u16string>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));

-	packet->Write<uint32_t>(this->value.length());
+	packet->Write(static_cast<uint32_t>(this->value.length()));
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet->Write<uint16_t>(this->value[i]);
+		packet->Write(static_cast<uint16_t>(this->value[i]));
 	}
 }

 // The specialized version for bool
 template<>
 inline void LDFData<bool>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));

-	packet->Write<uint8_t>(this->value);
+	packet->Write(static_cast<uint8_t>(this->value));
 }

 // The specialized version for std::string (UTF-8)
 template<>
 inline void LDFData<std::string>::WriteValue(RakNet::BitStream* packet) {
-	packet->Write<uint8_t>(this->GetValueType());
+	packet->Write(static_cast<uint8_t>(this->GetValueType()));

-	packet->Write<uint32_t>(this->value.length());
+	packet->Write(static_cast<uint32_t>(this->value.length()));
 	for (uint32_t i = 0; i < this->value.length(); ++i) {
-		packet->Write<uint8_t>(this->value[i]);
+		packet->Write(static_cast<uint8_t>(this->value[i]));
 	}
 }

--- a/dCommon/Logger.cpp
+++ b/dCommon/Logger.cpp
@@ -6,8 +6,6 @@
 #include <stdarg.h>

 Writer::~Writer() {
-	// Flush before we close
-	Flush();
 	// Dont try to close stdcout...
 	if (!m_Outfile || m_IsConsoleWriter) return;

--- a/dCommon/Metrics.cpp
+++ b/dCommon/Metrics.cpp
@@ -107,7 +107,7 @@ void Metrics::EndMeasurement(MetricVariable variable) {
 }

 float Metrics::ToMiliseconds(int64_t nanoseconds) {
-	return static_cast<float>(nanoseconds) / 1e6;
+	return (float)nanoseconds / 1e6;
 }

 std::string Metrics::MetricVariableToString(MetricVariable variable) {
@@ -193,34 +193,34 @@ size_t Metrics::GetPeakRSS() {
 	/* Windows -------------------------------------------------- */
 	PROCESS_MEMORY_COUNTERS info;
 	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
-	return static_cast<size_t>(info.PeakWorkingSetSize);
+	return (size_t)info.PeakWorkingSetSize;

 #elif (defined(_AIX) || defined(__TOS__AIX__)) || (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__)))
 	/* AIX and Solaris ------------------------------------------ */
 	struct psinfo psinfo;
 	int fd = -1;
 	if ((fd = open("/proc/self/psinfo", O_RDONLY)) == -1)
-		return static_cast<size_t>(0L);      /* Can't open? */
+		return (size_t)0L;      /* Can't open? */
 	if (read(fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
 		close(fd);
-		return static_cast<size_t>(0L);      /* Can't read? */
+		return (size_t)0L;      /* Can't read? */
 	}
 	close(fd);
-	return static_cast<size_t>(psinfo.pr_rssize * 1024L);
+	return (size_t)(psinfo.pr_rssize * 1024L);

 #elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
 	/* BSD, Linux, and OSX -------------------------------------- */
 	struct rusage rusage;
 	getrusage(RUSAGE_SELF, &rusage);
 #if defined(__APPLE__) && defined(__MACH__)
-	return static_cast<size_t>(rusage.ru_maxrss);
+	return (size_t)rusage.ru_maxrss;
 #else
-	return static_cast<size_t>(rusage.ru_maxrss * 1024L);
+	return (size_t)(rusage.ru_maxrss * 1024L);
 #endif

 #else
 	/* Unknown OS ----------------------------------------------- */
-	return static_cast<size_t>(0L);          /* Unsupported. */
+	return (size_t)0L;          /* Unsupported. */
 #endif

 }
@@ -234,33 +234,33 @@ size_t Metrics::GetCurrentRSS() {
 	/* Windows -------------------------------------------------- */
 	PROCESS_MEMORY_COUNTERS info;
 	GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
-	return static_cast<size_t>(info.WorkingSetSize);
+	return (size_t)info.WorkingSetSize;

 #elif defined(__APPLE__) && defined(__MACH__)
 	/* OSX ------------------------------------------------------ */
 	struct mach_task_basic_info info;
 	mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
 	if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO,
-		reinterpret_cast<task_info_t>(&info), &infoCount) != KERN_SUCCESS)
-		return static_cast<size_t>(0L);      /* Can't access? */
-	return static_cast<size_t>(info.resident_size);
+		(task_info_t)&info, &infoCount) != KERN_SUCCESS)
+		return (size_t)0L;      /* Can't access? */
+	return (size_t)info.resident_size;

 #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__)
 	/* Linux ---------------------------------------------------- */
 	long rss = 0L;
 	FILE* fp = NULL;
 	if ((fp = fopen("/proc/self/statm", "r")) == NULL)
-		return static_cast<size_t>(0L);      /* Can't open? */
+		return (size_t)0L;      /* Can't open? */
 	if (fscanf(fp, "%*s%ld", &rss) != 1) {
 		fclose(fp);
-		return static_cast<size_t>(0L);      /* Can't read? */
+		return (size_t)0L;      /* Can't read? */
 	}
 	fclose(fp);
-	return static_cast<size_t>(rss) * static_cast<size_t>(sysconf(_SC_PAGESIZE));
+	return (size_t)rss * (size_t)sysconf(_SC_PAGESIZE);

 #else
 	/* AIX, BSD, Solaris, and Unknown OS ------------------------ */
-	return static_cast<size_t>(0L);          /* Unsupported. */
+	return (size_t)0L;          /* Unsupported. */
 #endif

 }
--- a/dCommon/NiPoint3.cpp
+++ b/dCommon/NiPoint3.cpp
@@ -114,13 +114,13 @@ bool NiPoint3::operator!=(const NiPoint3& point) const {
 //! Operator for subscripting
 float& NiPoint3::operator[](int i) {
 	float* base = &x;
-	return base[i];
+	return (float&)base[i];
 }

 //! Operator for subscripting
 const float& NiPoint3::operator[](int i) const {
 	const float* base = &x;
-	return base[i];
+	return (float&)base[i];
 }

 //! Operator for addition of vectors
@@ -181,7 +181,7 @@ bool NiPoint3::IsWithinAxisAlignedBox(const NiPoint3& minPoint, const NiPoint3&
 	if (this->y < minPoint.y) return false;
 	if (this->y > maxPoint.y) return false;

-	return (this->z < maxPoint.z && this->z > minPoint.z);
+	return (this->z < maxPoint.z&& this->z > minPoint.z);
 }

 //! Checks to see if the point (or vector) is within a sphere
@@ -232,21 +232,10 @@ NiPoint3 NiPoint3::MoveTowards(const NiPoint3& current, const NiPoint3& target,
 	float dx = target.x - current.x;
 	float dy = target.y - current.y;
 	float dz = target.z - current.z;
-
-	float lengthSquared = static_cast<float>(
-		static_cast<double>(dx) * static_cast<double>(dx) +
-		static_cast<double>(dy) * static_cast<double>(dy) +
-		static_cast<double>(dz) * static_cast<double>(dz)
-		);
-
-	if (static_cast<double>(lengthSquared) == 0.0
-		|| static_cast<double>(maxDistanceDelta) >= 0.0
-		&& static_cast<double>(lengthSquared)
-		<= static_cast<double>(maxDistanceDelta) * static_cast<double>(maxDistanceDelta)) {
+	float lengthSquared = (float)((double)dx * (double)dx + (double)dy * (double)dy + (double)dz * (double)dz);
+	if ((double)lengthSquared == 0.0 || (double)maxDistanceDelta >= 0.0 && (double)lengthSquared <= (double)maxDistanceDelta * (double)maxDistanceDelta)
 		return target;
-	}
-
-	float length = std::sqrt(lengthSquared);
+	float length = (float)std::sqrt((double)lengthSquared);
 	return NiPoint3(current.x + dx / length * maxDistanceDelta, current.y + dy / length * maxDistanceDelta, current.z + dz / length * maxDistanceDelta);
 }

--- a/dCommon/SHA512.cpp
+++ b/dCommon/SHA512.cpp
@@ -1,5 +1,3 @@
-// Source: http://www.zedwood.com/article/cpp-sha512-function
-
 #include "SHA512.h"

 #include <cstring>
--- a/dCommon/dClient/AssetManager.cpp
+++ b/dCommon/dClient/AssetManager.cpp
@@ -81,8 +81,8 @@ bool AssetManager::HasFile(const char* name) {
 	std::replace(fixedName.begin(), fixedName.end(), '/', '\\');
 	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;

-	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -113,7 +113,7 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 #endif
 		fseek(file, 0, SEEK_END);
 		*len = ftell(file);
-		*data = static_cast<char*>(malloc(*len));
+		*data = (char*)malloc(*len);
 		fseek(file, 0, SEEK_SET);
 		int32_t readInData = fread(*data, sizeof(uint8_t), *len, file);
 		fclose(file);
@@ -129,8 +129,8 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 		fixedName = "client\\res\\" + fixedName;
 	}
 	int32_t packIndex = -1;
-	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	uint32_t crc = crc32b(0xFFFFFFFF, (uint8_t*)fixedName.c_str(), fixedName.size());
+	crc = crc32b(crc, (Bytef*)"\0\0\0\0", 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -152,12 +152,13 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 	return success;
 }

-AssetStream AssetManager::GetFile(const char* name) {
-	char* buf; uint32_t len;
+AssetMemoryBuffer AssetManager::GetFileAsBuffer(const char* name) {
+	char* buf;
+	uint32_t len;

 	bool success = this->GetFile(name, &buf, &len);

-	return AssetStream(buf, len, success);
+	return AssetMemoryBuffer(buf, len, success);
 }

 uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
@@ -167,7 +168,7 @@ uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
 	crc = base;
 	for (i = 0; i < l; i++) {
 		// xor next byte to upper bits of crc
-		crc ^= (static_cast<unsigned int>(message[i]) << 24);
+		crc ^= (((unsigned int)message[i]) << 24);
 		for (j = 0; j < 8; j++) { // Do eight times.
 			msb = crc >> 31;
 			crc <<= 1;
--- a/dCommon/dClient/AssetManager.h
+++ b/dCommon/dClient/AssetManager.h
@@ -25,10 +25,6 @@ struct AssetMemoryBuffer : std::streambuf {
 		this->setg(base, base, base + n);
 	}

-	~AssetMemoryBuffer() {
-		if (m_Success) free(m_Base);
-	}
-
 	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
 		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
 	}
@@ -44,17 +40,9 @@ struct AssetMemoryBuffer : std::streambuf {
 			setg(eback(), eback() + off, egptr());
 		return gptr() - eback();
 	}
-};

-struct AssetStream : std::istream {
-	AssetStream(char* base, std::ptrdiff_t n, bool success) : std::istream(new AssetMemoryBuffer(base, n, success)) {}
-
-	~AssetStream() {
-		delete rdbuf();
-	}
-
-	operator bool() {
-		return reinterpret_cast<AssetMemoryBuffer*>(rdbuf())->m_Success;
+	void close() {
+		free(m_Base);
 	}
 };

@@ -68,7 +56,7 @@ public:

 	bool HasFile(const char* name);
 	bool GetFile(const char* name, char** data, uint32_t* len);
-	AssetStream GetFile(const char* name);
+	AssetMemoryBuffer GetFileAsBuffer(const char* name);

 private:
 	void LoadPackIndex();
--- a/dCommon/dClient/Pack.cpp
+++ b/dCommon/dClient/Pack.cpp
@@ -76,7 +76,7 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
 	fseek(file, pos, SEEK_SET);

 	if (!isCompressed) {
-		char* tempData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+		char* tempData = (char*)malloc(pkRecord.m_UncompressedSize);
 		int32_t readInData = fread(tempData, sizeof(uint8_t), pkRecord.m_UncompressedSize, file);

 		*data = tempData;
@@ -90,7 +90,7 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {

 	fseek(file, pos, SEEK_SET);

-	char* decompressedData = static_cast<char*>(malloc(pkRecord.m_UncompressedSize));
+	char* decompressedData = (char*)malloc(pkRecord.m_UncompressedSize);
 	uint32_t currentReadPos = 0;

 	while (true) {
@@ -100,12 +100,12 @@ bool Pack::ReadFileFromPack(uint32_t crc, char** data, uint32_t* len) {
 		int32_t readInData = fread(&size, sizeof(uint32_t), 1, file);
 		pos += 4; // Move pointer position 4 to the right

-		char* chunk = static_cast<char*>(malloc(size));
+		char* chunk = (char*)malloc(size);
 		int32_t readInData2 = fread(chunk, sizeof(int8_t), size, file);
 		pos += size; // Move pointer position the amount of bytes read to the right

 		int32_t err;
-		currentReadPos += ZCompression::Decompress(reinterpret_cast<uint8_t*>(chunk), size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);
+		currentReadPos += ZCompression::Decompress((uint8_t*)chunk, size, reinterpret_cast<uint8_t*>(decompressedData + currentReadPos), ZCompression::MAX_SD0_CHUNK_SIZE, err);

 		free(chunk);
 	}
--- a/dCommon/dClient/PackIndex.cpp
+++ b/dCommon/dClient/PackIndex.cpp
@@ -8,10 +8,21 @@ PackIndex::PackIndex(const std::filesystem::path& filePath) {

 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
-	
-	m_PackPaths.resize(m_PackPathCount);
-	for (auto& item : m_PackPaths) {
-		BinaryIO::ReadString<uint32_t>(m_FileStream, item, BinaryIO::ReadType::String);
+
+	for (int i = 0; i < m_PackPathCount; i++) {
+		uint32_t stringLen = 0;
+		BinaryIO::BinaryRead<uint32_t>(m_FileStream, stringLen);
+
+		std::string path;
+
+		for (int j = 0; j < stringLen; j++) {
+			char inChar;
+			BinaryIO::BinaryRead<char>(m_FileStream, inChar);
+
+			path += inChar;
+		}
+
+		m_PackPaths.push_back(path);
 	}

 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
--- a/dCommon/dConfig.cpp
+++ b/dCommon/dConfig.cpp
@@ -10,23 +10,8 @@ dConfig::dConfig(const std::string& filepath) {
 	LoadConfig();
 }

-std::filesystem::path GetConfigDir() {
-	std::filesystem::path config_dir = BinaryPathFinder::GetBinaryDir();
-	if (const char* env_p = std::getenv("DLU_CONFIG_DIR")) {
-		config_dir /= env_p;
-	}
-	return config_dir;
-}
-
-const bool dConfig::Exists(const std::string& filepath) {
-	std::filesystem::path config_dir = GetConfigDir();
-	return std::filesystem::exists(config_dir / filepath);
-}
-
 void dConfig::LoadConfig() {
-	std::filesystem::path config_dir = GetConfigDir();
-
-	std::ifstream in(config_dir / m_ConfigFilePath);
+	std::ifstream in(BinaryPathFinder::GetBinaryDir() / m_ConfigFilePath);
 	if (!in.good()) return;

 	std::string line{};
@@ -34,7 +19,7 @@ void dConfig::LoadConfig() {
 		if (!line.empty() && line.front() != '#') ProcessLine(line);
 	}

-	std::ifstream sharedConfig(config_dir / "sharedconfig.ini", std::ios::in);
+	std::ifstream sharedConfig(BinaryPathFinder::GetBinaryDir() / "sharedconfig.ini", std::ios::in);
 	if (!sharedConfig.good()) return;

 	line.clear();
@@ -49,20 +34,17 @@ void dConfig::ReloadConfig() {
 }

 const std::string& dConfig::GetValue(std::string key) {
-	std::string upper_key(key);
-	std::transform(upper_key.begin(), upper_key.end(), upper_key.begin(), ::toupper);
-	if (const char* env_p = std::getenv(upper_key.c_str())) {
-		this->m_ConfigValues[key] = env_p;
-	}
 	return this->m_ConfigValues[key];
 }

 void dConfig::ProcessLine(const std::string& line) {
-	auto splitLoc = line.find('=');
-	auto key = line.substr(0, splitLoc);
-	auto value = line.substr(splitLoc + 1);
+	auto splitLine = GeneralUtils::SplitString(line, '=');
+
+	if (splitLine.size() != 2) return;

 	//Make sure that on Linux, we remove special characters:
+	auto& key = splitLine.at(0);
+	auto& value = splitLine.at(1);
 	if (!value.empty() && value.at(value.size() - 1) == '\r') value.erase(value.size() - 1);

 	if (this->m_ConfigValues.find(key) != this->m_ConfigValues.end()) return;
--- a/dCommon/dConfig.h
+++ b/dCommon/dConfig.h
@@ -7,11 +7,6 @@ class dConfig {
 public:
 	dConfig(const std::string& filepath);

-	/**
-	 * Checks whether the specified filepath exists
-	 */
-	static const bool Exists(const std::string& filepath);
-
 	/**
 	 * Gets the specified key from the config.  Returns an empty string if the value is not found.
 	 *
--- a/dCommon/dEnums/StringifiedEnum.h
+++ b/dCommon/dEnums/StringifiedEnum.h
@@ -1,29 +0,0 @@
-#ifndef __STRINGIFIEDENUM_H__
-#define __STRINGIFIEDENUM_H__
-
-#include <string>
-#include "magic_enum.hpp"
-
-namespace StringifiedEnum {
-	template<typename T>
-	const std::string_view ToString(const T e) {
-		static_assert(std::is_enum_v<T>, "Not an enum"); // Check type
-
-		constexpr auto sv = &magic_enum::enum_entries<T>();
-
-		const auto it = std::lower_bound(
-			sv->begin(), sv->end(), e,
-			[&](const std::pair<T, std::string_view>& lhs, const T rhs) { return lhs.first < rhs; }
-		);
-
-		std::string_view output;
-		if (it != sv->end() && it->first == e) {
-			output = it->second;
-		} else {
-			output = "UNKNOWN";
-		}
-		return output;
-	}
-}
-
-#endif // !__STRINGIFIEDENUM_H__
--- a/dCommon/dEnums/dCommonVars.h
+++ b/dCommon/dEnums/dCommonVars.h
@@ -148,11 +148,11 @@ public:
 		if (size > maxSize) size = maxSize;

 		for (uint32_t i = 0; i < size; ++i) {
-			bitStream.Write<uint16_t>(friendName[i]);
+			bitStream.Write(static_cast<uint16_t>(friendName[i]));
 		}

 		for (uint32_t j = 0; j < remSize; ++j) {
-			bitStream.Write<uint16_t>(0);
+			bitStream.Write(static_cast<uint16_t>(0));
 		}

 		bitStream.Write<uint32_t>(0); //???
--- a/dCommon/dEnums/eGameMessageType.h
+++ b/dCommon/dEnums/eGameMessageType.h
--- a/dCommon/dEnums/ePlayerFlag.h
+++ b/dCommon/dEnums/ePlayerFlag.h
@@ -166,8 +166,7 @@ enum ePlayerFlag : int32_t {
 	NJ_LIGHTNING_SPINJITZU = 2031,
 	NJ_ICE_SPINJITZU = 2032,
 	NJ_FIRE_SPINJITZU = 2033,
-	NJ_WU_SHOW_DAILY_CHEST = 2099,
-	DLU_SKIP_CINEMATICS = 1'000'000,
+	NJ_WU_SHOW_DAILY_CHEST = 2099
 };

 #endif  //!__EPLAYERFLAG__H__
--- a/dCommon/dEnums/eQuickBuildState.h
+++ b/dCommon/dEnums/eQuickBuildState.h
@@ -1,15 +0,0 @@
-#ifndef __EQUICKBUILDSTATE__H__
-#define __EQUICKBUILDSTATE__H__
-
-#include <cstdint>
-
-enum class eQuickBuildState : uint32_t {
-	OPEN,
-	COMPLETED = 2,
-	RESETTING = 4,
-	BUILDING,
-	INCOMPLETE
-};
-
-
-#endif  //!__EQUICKBUILDSTATE__H__
--- a/dCommon/dEnums/eRebuildState.h
+++ b/dCommon/dEnums/eRebuildState.h
@@ -0,0 +1,15 @@
+#ifndef __EREBUILDSTATE__H__
+#define __EREBUILDSTATE__H__
+
+#include <cstdint>
+
+enum class eRebuildState : uint32_t {
+	OPEN,
+	COMPLETED = 2,
+	RESETTING = 4,
+	BUILDING,
+	INCOMPLETE
+};
+
+
+#endif  //!__EREBUILDSTATE__H__
--- a/dCommon/dEnums/eReplicaComponentType.h
+++ b/dCommon/dEnums/eReplicaComponentType.h
@@ -34,7 +34,7 @@ enum class eReplicaComponentType : uint32_t {
 	PLATFORM_BOUNDARY,
 	MODULE,
 	ARCADE,
-	HAVOK_VEHICLE_PHYSICS,
+	VEHICLE_PHYSICS, // Havok demo based
 	MOVEMENT_AI,
 	EXHIBIT,
 	OVERHEAD_ICON,
@@ -50,11 +50,11 @@ enum class eReplicaComponentType : uint32_t {
 	PROPERTY_ENTRANCE,
 	FX,
 	PROPERTY_MANAGEMENT,
-	VEHICLE_PHYSICS,
+	VEHICLE_PHYSICS_NEW, // internal physics based on havok
 	PHYSICS_SYSTEM,
 	QUICK_BUILD,
 	SWITCH,
-	MINI_GAME_CONTROL,
+	ZONE_CONTROL, // Minigame
 	CHANGLING,
 	CHOICE_BUILD,
 	PACKAGE,
--- a/dCommon/dEnums/eWorldMessageType.h
+++ b/dCommon/dEnums/eWorldMessageType.h
@@ -3,8 +3,6 @@

 #include <cstdint>

-#include "magic_enum.hpp"
-
 enum class eWorldMessageType : uint32_t {
 	VALIDATION = 1,  // 				Session info
 	CHARACTER_LIST_REQUEST,
@@ -38,14 +36,7 @@ enum class eWorldMessageType : uint32_t {
 	HANDLE_FUNNESS,
 	FAKE_PRG_CSR_MESSAGE,
 	REQUEST_FREE_TRIAL_REFRESH,
-	GM_SET_FREE_TRIAL_STATUS,
-	UI_HELP_TOP_5 = 91
-};
-
-template <>
-struct magic_enum::customize::enum_range<eWorldMessageType> {
-	static constexpr int min = 0;
-	static constexpr int max = 91;
+	GM_SET_FREE_TRIAL_STATUS
 };

 #endif  //!__EWORLDMESSAGETYPE__H__
--- a/dDatabase/CDClientDatabase/CDClientDatabase.cpp
+++ b/dDatabase/CDClientDatabase/CDClientDatabase.cpp
--- a/dDatabase/CDClientDatabase/CDClientDatabase.h
+++ b/dDatabase/CDClientDatabase/CDClientDatabase.h
--- a/dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.cpp
+++ b/dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.cpp
@@ -1,47 +0,0 @@
-#include "CDRewardCodesTable.h"
-
-void CDRewardCodesTable::LoadValuesFromDatabase() {
-
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM RewardCodes");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
-
-		tableSize.nextRow();
-	}
-
-	tableSize.finalize();
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM RewardCodes");
-	while (!tableData.eof()) {
-		CDRewardCode entry;
-		entry.id = tableData.getIntField("id", -1);
-		entry.code = tableData.getStringField("code", "");
-		entry.attachmentLOT = tableData.getIntField("attachmentLOT", -1);
-		UNUSED_COLUMN(entry.locStatus = tableData.getIntField("locStatus", -1));
-		UNUSED_COLUMN(entry.gate_version = tableData.getStringField("gate_version", ""));
-
-		this->entries.push_back(entry);
-		tableData.nextRow();
-	}
-}
-
-LOT CDRewardCodesTable::GetAttachmentLOT(uint32_t rewardCodeId) const {
-	for (auto const &entry : this->entries){
-		if (rewardCodeId == entry.id) return entry.attachmentLOT;
-	}
-	return LOT_NULL;
-}
-
-uint32_t CDRewardCodesTable::GetCodeID(std::string code) const {
-	for (auto const &entry : this->entries){
-		if (code == entry.code) return entry.id;
-	}
-	return -1;
-}
-
--- a/dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.h
+++ b/dDatabase/CDClientDatabase/CDClientTables/CDRewardCodesTable.h
@@ -1,25 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "CDTable.h"
-
-
-struct CDRewardCode {
-	uint32_t id;
-	std::string code;
-	LOT attachmentLOT;
-	UNUSED(uint32_t locStatus);
-	UNUSED(std::string gate_version);
-};
-
-
-class CDRewardCodesTable : public CDTable<CDRewardCodesTable> {
-private:
-	std::vector<CDRewardCode> entries;
-
-public:
-	void LoadValuesFromDatabase();
-	const std::vector<CDRewardCode>& GetEntries() const;
-	LOT GetAttachmentLOT(uint32_t rewardCodeId) const;
-	uint32_t GetCodeID(std::string code) const;
-};
--- a/dDatabase/CDClientDatabase/CMakeLists.txt
+++ b/dDatabase/CDClientDatabase/CMakeLists.txt
@@ -1,12 +0,0 @@
-set(DDATABASE_CDCLIENTDATABASE_SOURCES
-	"CDClientDatabase.cpp"
-	"CDClientManager.cpp"
-)
-
-add_subdirectory(CDClientTables)
-
-foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
-	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
-endforeach()
-
-set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)
--- a/dDatabase/CDClientDatabase/CDClientManager.cpp
+++ b/dDatabase/CDClientDatabase/CDClientManager.cpp
@@ -37,13 +37,10 @@
 #include "CDPropertyTemplateTable.h"
 #include "CDFeatureGatingTable.h"
 #include "CDRailActivatorComponent.h"
-#include "CDRewardCodesTable.h"

-#ifndef CDCLIENT_CACHE_ALL
 // Uncomment this to cache the full cdclient database into memory. This will make the server load faster, but will use more memory.
 // A vanilla CDClient takes about 46MB of memory + the regular world data.
-// #  define CDCLIENT_CACHE_ALL
-#endif // CDCLIENT_CACHE_ALL
+// #define CDCLIENT_CACHE_ALL

 #ifdef CDCLIENT_CACHE_ALL
 	#define CDCLIENT_DONT_CACHE_TABLE(x) x
@@ -85,7 +82,6 @@ CDClientManager::CDClientManager() {
 	CDRailActivatorComponentTable::Instance().LoadValuesFromDatabase();
 	CDRarityTableTable::Instance().LoadValuesFromDatabase();
 	CDRebuildComponentTable::Instance().LoadValuesFromDatabase();
-	CDRewardCodesTable::Instance().LoadValuesFromDatabase();
 	CDRewardsTable::Instance().LoadValuesFromDatabase();
 	CDScriptComponentTable::Instance().LoadValuesFromDatabase();
 	CDSkillBehaviorTable::Instance().LoadValuesFromDatabase();
--- a/dDatabase/CDClientDatabase/CDClientManager.h
+++ b/dDatabase/CDClientDatabase/CDClientManager.h
--- a/dDatabase/CMakeLists.txt
+++ b/dDatabase/CMakeLists.txt
@@ -1,20 +1,13 @@
-set(DDATABASE_SOURCES)
+set(DDATABASE_SOURCES "CDClientDatabase.cpp"
+		"CDClientManager.cpp"
+		"Database.cpp"
+		"MigrationRunner.cpp")

-add_subdirectory(CDClientDatabase)
+add_subdirectory(Tables)

-foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
-endforeach()
-
-add_subdirectory(GameDatabase)
-
-foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
+foreach(file ${DDATABASE_TABLES_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Tables/${file}")
 endforeach()

 add_library(dDatabase STATIC ${DDATABASE_SOURCES})
 target_link_libraries(dDatabase sqlite3 mariadbConnCpp)
-
-if (${CDCLIENT_CACHE_ALL})
-	add_compile_definitions(dDatabase CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
-endif()
--- a/dDatabase/Database.cpp
+++ b/dDatabase/Database.cpp
@@ -0,0 +1,118 @@
+#include "Database.h"
+#include "Game.h"
+#include "dConfig.h"
+#include "Logger.h"
+using namespace std;
+
+#pragma warning (disable:4251) //Disables SQL warnings
+
+sql::Driver* Database::driver;
+sql::Connection* Database::con;
+sql::Properties Database::props;
+std::string Database::database;
+
+void Database::Connect(const string& host, const string& database, const string& username, const string& password) {
+
+	//To bypass debug issues:
+	const char* szDatabase = database.c_str();
+	const char* szUsername = username.c_str();
+	const char* szPassword = password.c_str();
+
+	driver = sql::mariadb::get_driver_instance();
+
+	sql::Properties properties;
+	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
+	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
+	//    presence of a /
+	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
+	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
+	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
+	// property manually (which the URL parsing fails to do)
+	const std::string UNIX_PROTO = "unix://";
+	const std::string PIPE_PROTO = "pipe://";
+    if (host.find(UNIX_PROTO) == 0) {
+		properties["hostName"] = "unix://localhost";
+		properties["localSocket"] = host.substr(UNIX_PROTO.length()).c_str();
+    } else if (host.find(PIPE_PROTO) == 0) {
+		properties["hostName"] = "pipe://localhost";
+		properties["pipe"] = host.substr(PIPE_PROTO.length()).c_str();
+    } else {
+		properties["hostName"] = host.c_str();
+    }
+	properties["user"] = szUsername;
+	properties["password"] = szPassword;
+	properties["autoReconnect"] = "true";
+
+	Database::props = properties;
+	Database::database = database;
+
+	Database::Connect();
+}
+
+void Database::Connect() {
+	// `connect(const Properties& props)` segfaults in windows debug, but
+	// `connect(const SQLString& host, const SQLString& user, const SQLString& pwd)` doesn't handle pipes/unix sockets correctly
+	if (Database::props.find("localSocket") != Database::props.end() || Database::props.find("pipe") != Database::props.end()) {
+		con = driver->connect(Database::props);
+	} else {
+		con = driver->connect(Database::props["hostName"].c_str(), Database::props["user"].c_str(), Database::props["password"].c_str());
+	}
+	con->setSchema(Database::database.c_str());
+}
+
+void Database::Destroy(std::string source, bool log) {
+	if (!con) return;
+
+	if (log) {
+		if (source != "") LOG("Destroying MySQL connection from %s!", source.c_str());
+		else LOG("Destroying MySQL connection!");
+	}
+
+	con->close();
+	delete con;
+} //Destroy
+
+sql::Statement* Database::CreateStmt() {
+	sql::Statement* toReturn = con->createStatement();
+	return toReturn;
+} //CreateStmt
+
+sql::PreparedStatement* Database::CreatePreppedStmt(const std::string& query) {
+	const char* test = query.c_str();
+	size_t size = query.length();
+	sql::SQLString str(test, size);
+
+	if (!con) {
+		Connect();
+		LOG("Trying to reconnect to MySQL");
+	}
+
+	if (!con->isValid() || con->isClosed()) {
+		delete con;
+
+		con = nullptr;
+
+		Connect();
+		LOG("Trying to reconnect to MySQL from invalid or closed connection");
+	}
+
+	auto* stmt = con->prepareStatement(str);
+
+	return stmt;
+} //CreatePreppedStmt
+
+void Database::Commit() {
+	Database::con->commit();
+}
+
+bool Database::GetAutoCommit() {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	return con->getAutoCommit();
+}
+
+void Database::SetAutoCommit(bool value) {
+	// TODO This should not just access a pointer.  A future PR should update this
+	// to check for null and throw an error if the connection is not valid.
+	Database::con->setAutoCommit(value);
+}
--- a/dDatabase/Database.h
+++ b/dDatabase/Database.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <string>
+#include <conncpp.hpp>
+
+class MySqlException : public std::runtime_error {
+public:
+	MySqlException() : std::runtime_error("MySQL error!") {}
+	MySqlException(const std::string& msg) : std::runtime_error(msg.c_str()) {}
+};
+
+class Database {
+private:
+	static sql::Driver* driver;
+	static sql::Connection* con;
+	static sql::Properties props;
+	static std::string database;
+public:
+	static void Connect(const std::string& host, const std::string& database, const std::string& username, const std::string& password);
+	static void Connect();
+	static void Destroy(std::string source = "", bool log = true);
+
+	static sql::Statement* CreateStmt();
+	static sql::PreparedStatement* CreatePreppedStmt(const std::string& query);
+	static void Commit();
+	static bool GetAutoCommit();
+	static void SetAutoCommit(bool value);
+
+	static std::string GetDatabase() { return database; }
+	static sql::Properties GetProperties() { return props; }
+};
--- a/dDatabase/GameDatabase/CMakeLists.txt
+++ b/dDatabase/GameDatabase/CMakeLists.txt
@@ -1,12 +0,0 @@
-set(DDATABASE_GAMEDATABASE_SOURCES
-	"Database.cpp"
-	"MigrationRunner.cpp"
-)
-
-add_subdirectory(MySQL)
-
-foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
-endforeach()
-
-set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} PARENT_SCOPE)
--- a/dDatabase/GameDatabase/Database.cpp
+++ b/dDatabase/GameDatabase/Database.cpp
@@ -1,40 +0,0 @@
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-#include "MySQLDatabase.h"
-#include "DluAssert.h"
-
-#pragma warning (disable:4251) //Disables SQL warnings
-
-namespace {
-	GameDatabase* database = nullptr;
-}
-
-void Database::Connect() {
-	if (database) {
-		LOG("Tried to connect to database when it's already connected!");
-		return;
-	}
-
-	database = new MySQLDatabase();
-	database->Connect();
-}
-
-GameDatabase* Database::Get() {
-	if (!database) {
-		LOG("Tried to get database when it's not connected!");
-		Connect();
-	}
-	return database;
-}
-
-void Database::Destroy(std::string source) {
-	if (database) {
-		database->Destroy(source);
-		delete database;
-		database = nullptr;
-	} else {
-		LOG("Trying to destroy database when it's not connected!");
-	}
-}
--- a/dDatabase/GameDatabase/Database.h
+++ b/dDatabase/GameDatabase/Database.h
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <string>
-#include <conncpp.hpp>
-
-#include "GameDatabase.h"
-
-namespace Database {
-	void Connect();
-	GameDatabase* Get();
-	void Destroy(std::string source = "");
-};
--- a/dDatabase/GameDatabase/GameDatabase.h
+++ b/dDatabase/GameDatabase/GameDatabase.h
@@ -1,57 +0,0 @@
-#ifndef __GAMEDATABASE__H__
-#define __GAMEDATABASE__H__
-
-#include <optional>
-
-#include "ILeaderboard.h"
-#include "IPlayerCheatDetections.h"
-#include "ICommandLog.h"
-#include "IMail.h"
-#include "IObjectIdTracker.h"
-#include "IPlayKeys.h"
-#include "IServers.h"
-#include "IBugReports.h"
-#include "IPropertyContents.h"
-#include "IProperty.h"
-#include "IPetNames.h"
-#include "ICharXml.h"
-#include "IMigrationHistory.h"
-#include "IUgc.h"
-#include "IFriends.h"
-#include "ICharInfo.h"
-#include "IAccounts.h"
-#include "IActivityLog.h"
-#include "IIgnoreList.h"
-#include "IAccountsRewardCodes.h"
-
-namespace sql {
-	class Statement;
-	class PreparedStatement;
-};
-
-#ifdef _DEBUG
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) do { try { x; } catch (sql::SQLException& ex) { LOG("SQL Error: %s", ex.what()); throw; } } while(0)
-#else
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) x
-#endif // _DEBUG
-
-class GameDatabase :
-	public IPlayKeys, public ILeaderboard, public IObjectIdTracker, public IServers,
-	public IMail, public ICommandLog, public IPlayerCheatDetections, public IBugReports,
-	public IPropertyContents, public IProperty, public IPetNames, public ICharXml,
-	public IMigrationHistory, public IUgc, public IFriends, public ICharInfo,
-	public IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList {
-public:
-	virtual ~GameDatabase() = default;
-	// TODO: These should be made private.
-	virtual void Connect() = 0;
-	virtual void Destroy(std::string source = "") = 0;
-	virtual void ExecuteCustomQuery(const std::string_view query) = 0;
-	virtual sql::PreparedStatement* CreatePreppedStmt(const std::string& query) = 0;
-	virtual void Commit() = 0;
-	virtual bool GetAutoCommit() = 0;
-	virtual void SetAutoCommit(bool value) = 0;
-	virtual void DeleteCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__GAMEDATABASE__H__
--- a/dDatabase/GameDatabase/ITables/IAccounts.h
+++ b/dDatabase/GameDatabase/ITables/IAccounts.h
@@ -1,37 +0,0 @@
-#ifndef __IACCOUNTS__H__
-#define __IACCOUNTS__H__
-
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-enum class eGameMasterLevel : uint8_t;
-
-class IAccounts {
-public:
-	struct Info {
-		std::string bcryptPassword;
-		uint32_t id{};
-		uint32_t playKeyId{};
-		bool banned{};
-		bool locked{};
-		eGameMasterLevel maxGmLevel{};
-	};
-
-	// Get the account info for the given username.
-	virtual std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) = 0;
-
-	// Update the account's unmute time.
-	virtual void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) = 0;
-
-	// Update the account's ban status.
-	virtual void UpdateAccountBan(const uint32_t accountId, const bool banned) = 0;
-
-	// Update the account's password.
-	virtual void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) = 0;
-
-	// Add a new account to the database.
-	virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;
-};
-
-#endif  //!__IACCOUNTS__H__
--- a/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h
+++ b/dDatabase/GameDatabase/ITables/IAccountsRewardCodes.h
@@ -1,13 +0,0 @@
-#ifndef __IACCOUNTSREWARDCODES__H__
-#define __IACCOUNTSREWARDCODES__H__
-
-#include <cstdint>
-#include <vector>
-
-class IAccountsRewardCodes {
-public:
-	virtual void InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) = 0;
-	virtual std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) = 0;
-};
-
-#endif  //!__IACCOUNTSREWARDCODES__H__
--- a/dDatabase/GameDatabase/ITables/IActivityLog.h
+++ b/dDatabase/GameDatabase/ITables/IActivityLog.h
@@ -1,19 +0,0 @@
-#ifndef __IACTIVITYLOG__H__
-#define __IACTIVITYLOG__H__
-
-#include <cstdint>
-
-#include "dCommonVars.h"
-
-enum class eActivityType : uint32_t {
-	PlayerLoggedIn,
-	PlayerLoggedOut,
-};
-
-class IActivityLog {
-public:
-	// Update the activity log for the given account.
-	virtual void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) = 0;
-};
-
-#endif  //!__IACTIVITYLOG__H__
--- a/dDatabase/GameDatabase/ITables/IBugReports.h
+++ b/dDatabase/GameDatabase/ITables/IBugReports.h
@@ -1,20 +0,0 @@
-#ifndef __IBUGREPORTS__H__
-#define __IBUGREPORTS__H__
-
-#include <cstdint>
-#include <string_view>
-
-class IBugReports {
-public:
-	struct Info {
-		std::string body;
-		std::string clientVersion;
-		std::string otherPlayer;
-		std::string selection;
-		uint32_t characterId{};
-	};
-
-	// Add a new bug report to the database.
-	virtual void InsertNewBugReport(const Info& info) = 0;
-};
-#endif  //!__IBUGREPORTS__H__
--- a/dDatabase/GameDatabase/ITables/ICharInfo.h
+++ b/dDatabase/GameDatabase/ITables/ICharInfo.h
@@ -1,49 +0,0 @@
-#ifndef __ICHARINFO__H__
-#define __ICHARINFO__H__
-
-#include <cstdint>
-#include <optional>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "ePermissionMap.h"
-
-class ICharInfo {
-public:
-	struct Info {
-		std::string name;
-		std::string pendingName;
-		uint32_t id{};
-		uint32_t accountId{};
-		bool needsRename{};
-		LWOCLONEID cloneId{};
-		ePermissionMap permissionMap{};
-	};
-
-	// Get the approved names of all characters.
-	virtual std::vector<std::string> GetApprovedCharacterNames() = 0;
-
-	// Get the character info for the given character id.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) = 0;
-
-	// Get the character info for the given character name.
-	virtual std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view name) = 0;
-	
-	// Get the character ids for the given account.
-	virtual std::vector<uint32_t> GetAccountCharacterIds(const uint32_t accountId) = 0;
-
-	// Insert a new character into the database.
-	virtual void InsertNewCharacter(const ICharInfo::Info info) = 0;
-
-	// Set the name of the given character.
-	virtual void SetCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Set the pending name of the given character.
-	virtual void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) = 0;
-
-	// Updates the given character ids last login to be right now.
-	virtual void UpdateLastLoggedInCharacter(const uint32_t characterId) = 0;
-};
-
-#endif  //!__ICHARINFO__H__
--- a/dDatabase/GameDatabase/ITables/ICharXml.h
+++ b/dDatabase/GameDatabase/ITables/ICharXml.h
@@ -1,20 +0,0 @@
-#ifndef __ICHARXML__H__
-#define __ICHARXML__H__
-
-#include <cstdint>
-#include <string>
-#include <string_view>
-
-class ICharXml {
-public:
-	// Get the character xml for the given character id.
-	virtual std::string GetCharacterXml(const uint32_t charId) = 0;
-
-	// Update the character xml for the given character id.
-	virtual void UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) = 0;
-
-	// Insert the character xml for the given character id.
-	virtual void InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) = 0;
-};
-
-#endif  //!__ICHARXML__H__
--- a/dDatabase/GameDatabase/ITables/ICommandLog.h
+++ b/dDatabase/GameDatabase/ITables/ICommandLog.h
@@ -1,14 +0,0 @@
-#ifndef __ICOMMANDLOG__H__
-#define __ICOMMANDLOG__H__
-
-#include <cstdint>
-#include <string_view>
-
-class ICommandLog {
-public:	
-
-	// Insert a new slash command log entry.
-	virtual void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) = 0;
-};
-
-#endif  //!__ICOMMANDLOG__H__
--- a/dDatabase/GameDatabase/ITables/IFriends.h
+++ b/dDatabase/GameDatabase/ITables/IFriends.h
@@ -1,32 +0,0 @@
-#ifndef __IFRIENDS__H__
-#define __IFRIENDS__H__
-
-#include <cstdint>
-#include <optional>
-#include <vector>
-
-class IFriends {
-public:
-	struct BestFriendStatus {
-		uint32_t playerCharacterId{};
-		uint32_t friendCharacterId{};
-		uint32_t bestFriendStatus{};
-	};
-
-	// Get the friends list for the given character id.
-	virtual std::vector<FriendData> GetFriendsList(const uint32_t charId) = 0;
-
-	// Get the best friend status for the given player and friend character ids.
-	virtual std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-
-	// Set the best friend status for the given player and friend character ids.
-	virtual void SetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId, const uint32_t bestFriendStatus) = 0;
-
-	// Add a friend to the given character id.
-	virtual void AddFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-
-	// Remove a friend from the given character id.
-	virtual void RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) = 0;
-};
-
-#endif  //!__IFRIENDS__H__
--- a/dDatabase/GameDatabase/ITables/IIgnoreList.h
+++ b/dDatabase/GameDatabase/ITables/IIgnoreList.h
@@ -1,20 +0,0 @@
-#ifndef __IIGNORELIST__H__
-#define __IIGNORELIST__H__
-
-#include <cstdint>
-#include <string>
-#include <vector>
-
-class IIgnoreList {
-public:
-	struct Info {
-		std::string name;
-		uint32_t id;
-	};
-
-	virtual std::vector<Info> GetIgnoreList(const uint32_t playerId) = 0;
-	virtual void AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) = 0;
-	virtual void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) = 0;
-};
-
-#endif  //!__IIGNORELIST__H__
--- a/dDatabase/GameDatabase/ITables/ILeaderboard.h
+++ b/dDatabase/GameDatabase/ITables/ILeaderboard.h
@@ -1,14 +0,0 @@
-#ifndef __ILEADERBOARD__H__
-#define __ILEADERBOARD__H__
-
-#include <cstdint>
-#include <optional>
-
-class ILeaderboard {
-public:
-
-	// Get the donation total for the given activity id.
-	virtual std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) = 0;
-};
-
-#endif  //!__ILEADERBOARD__H__
--- a/dDatabase/GameDatabase/ITables/IMail.h
+++ b/dDatabase/GameDatabase/ITables/IMail.h
@@ -1,54 +0,0 @@
-#ifndef __IMAIL__H__
-#define __IMAIL__H__
-
-#include <cstdint>
-#include <optional>
-#include <string_view>
-
-#include "dCommonVars.h"
-#include "NiQuaternion.h"
-#include "NiPoint3.h"
-
-class IMail {
-public:
-	struct MailInfo {
-		std::string senderUsername;
-		std::string recipient;
-		std::string subject;
-		std::string body;
-		uint64_t id{};
-		uint32_t senderId{};
-		uint32_t receiverId{};
-		uint64_t timeSent{};
-		bool wasRead{};
-		struct {
-			LWOOBJID itemID{};
-			int32_t itemCount{};
-			LOT itemLOT{};
-			LWOOBJID itemSubkey{};
-		};
-	};
-
-	// Insert a new mail into the database.
-	virtual void InsertNewMail(const MailInfo& mail) = 0;
-
-	// Get the mail for the given character id.
-	virtual std::vector<MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) = 0;
-
-	// Get the mail for the given mail id.
-	virtual std::optional<MailInfo> GetMail(const uint64_t mailId) = 0;
-
-	// Get the number of unread mail for the given character id.
-	virtual uint32_t GetUnreadMailCount(const uint32_t characterId) = 0;
-
-	// Mark the given mail as read.
-	virtual void MarkMailRead(const uint64_t mailId) = 0;
-
-	// Claim the item from the given mail.
-	virtual void ClaimMailItem(const uint64_t mailId) = 0;
-
-	// Delete the given mail.
-	virtual void DeleteMail(const uint64_t mailId) = 0;
-};
-
-#endif  //!__IMAIL__H__
--- a/dDatabase/GameDatabase/ITables/IMigrationHistory.h
+++ b/dDatabase/GameDatabase/ITables/IMigrationHistory.h
@@ -1,17 +0,0 @@
-#ifndef __IMIGRATIONHISTORY__H__
-#define __IMIGRATIONHISTORY__H__
-
-#include <string_view>
-
-class IMigrationHistory {
-public:
-	// Create the migration history table.
-	virtual void CreateMigrationHistoryTable() = 0;
-
-	// Check if the given migration has been run.
-	virtual bool IsMigrationRun(const std::string_view str) = 0;
-
-	// Insert the given migration into the migration history table.
-	virtual void InsertMigration(const std::string_view str) = 0;
-};
-#endif  //!__IMIGRATIONHISTORY__H__
--- a/dDatabase/GameDatabase/ITables/IObjectIdTracker.h
+++ b/dDatabase/GameDatabase/ITables/IObjectIdTracker.h
@@ -1,19 +0,0 @@
-#ifndef __IOBJECTIDTRACKER__H__
-#define __IOBJECTIDTRACKER__H__
-
-#include <cstdint>
-#include <optional>
-
-class IObjectIdTracker {
-public:
-	// Get the current persistent id.
-	virtual std::optional<uint32_t> GetCurrentPersistentId() = 0;
-
-	// Insert the default persistent id.
-	virtual void InsertDefaultPersistentId() = 0;
-
-	// Update the persistent id.
-	virtual void UpdatePersistentId(const uint32_t newId) = 0;
-};
-
-#endif  //!__IOBJECTIDTRACKER__H__
--- a/dDatabase/GameDatabase/ITables/IPetNames.h
+++ b/dDatabase/GameDatabase/ITables/IPetNames.h
@@ -1,21 +0,0 @@
-#ifndef __IPETNAMES__H__
-#define __IPETNAMES__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPetNames {
-public:
-	struct Info {
-		std::string petName;
-		int32_t approvalStatus{};
-	};
-
-	// Set the pet name moderation status for the given pet id.
-	virtual void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) = 0;
-
-	// Get pet info for the given pet id.
-	virtual std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) = 0;
-};
-
-#endif  //!__IPETNAMES__H__
--- a/dDatabase/GameDatabase/ITables/IPlayKeys.h
+++ b/dDatabase/GameDatabase/ITables/IPlayKeys.h
@@ -1,15 +0,0 @@
-#ifndef __IPLAYKEYS__H__
-#define __IPLAYKEYS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPlayKeys {
-public:
-	// Get the playkey id for the given playkey.
-	// Optional of bool may seem pointless, however the optional indicates if the playkey exists
-	// and the bool indicates if the playkey is active.
-	virtual std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) = 0;
-};
-
-#endif  //!__IPLAYKEYS__H__
--- a/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h
+++ b/dDatabase/GameDatabase/ITables/IPlayerCheatDetections.h
@@ -1,20 +0,0 @@
-#ifndef __IPLAYERCHEATDETECTIONS__H__
-#define __IPLAYERCHEATDETECTIONS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IPlayerCheatDetections {
-public:
-	struct Info {
-		std::optional<uint32_t> userId = std::nullopt;
-		std::string username;
-		std::string systemAddress;
-		std::string extraMessage;
-	};
-
-	// Insert a new cheat detection.
-	virtual void InsertCheatDetection(const IPlayerCheatDetections::Info& info) = 0;
-};
-
-#endif  //!__IPLAYERCHEATDETECTIONS__H__
--- a/dDatabase/GameDatabase/ITables/IProperty.h
+++ b/dDatabase/GameDatabase/ITables/IProperty.h
@@ -1,38 +0,0 @@
-#ifndef __IPROPERTY__H__
-#define __IPROPERTY__H__
-
-#include <cstdint>
-#include <optional>
-
-class IProperty {
-public:
-	struct Info {
-		std::string name;
-		std::string description;
-		std::string rejectionReason;
-		LWOOBJID id{};
-		uint32_t ownerId{};
-		LWOCLONEID cloneId{};
-		int32_t privacyOption{};
-		uint32_t modApproved{};
-		uint32_t lastUpdatedTime{};
-		uint32_t claimedTime{};
-		uint32_t reputation{};
-	};
-
-	// Get the property info for the given property id.
-	virtual std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) = 0;
-
-	// Update the property moderation info for the given property id.
-	virtual void UpdatePropertyModerationInfo(const IProperty::Info& info) = 0;
-	
-	// Update the property details for the given property id.
-	virtual void UpdatePropertyDetails(const IProperty::Info& info) = 0;
-
-	// Update the property performance cost for the given property id.
-	virtual void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) = 0;
-	
-	// Insert a new property into the database.
-	virtual void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) = 0;
-};
-#endif  //!__IPROPERTY__H__
--- a/dDatabase/GameDatabase/ITables/IPropertyContents.h
+++ b/dDatabase/GameDatabase/ITables/IPropertyContents.h
@@ -1,40 +0,0 @@
-#ifndef __IPROPERTIESCONTENTS__H__
-#define __IPROPERTIESCONTENTS__H__
-
-#include <cstdint>
-#include <string_view>
-
-class IPropertyContents {
-public:	
-	struct Model {
-		inline bool operator==(const LWOOBJID& other) const noexcept {
-			return id == other;
-		}
-
-		NiPoint3 position;
-		NiQuaternion rotation;
-		LWOOBJID id{};
-		LOT lot{};
-		uint32_t ugcId{};
-	};
-
-	// Inserts a new UGC model into the database.
-	virtual void InsertNewUgcModel(
-		std::istringstream& sd0Data,
-		const uint32_t blueprintId,
-		const uint32_t accountId,
-		const uint32_t characterId) = 0;
-
-	// Get the property models for the given property id.
-	virtual std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) = 0;
-
-	// Insert a new property model into the database.
-	virtual void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) = 0;
-
-	// Update the model position and rotation for the given property id.
-	virtual void UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) = 0;
-
-	// Remove the model for the given property id.
-	virtual void RemoveModel(const LWOOBJID& modelId) = 0;
-};
-#endif  //!__IPROPERTIESCONTENTS__H__
--- a/dDatabase/GameDatabase/ITables/IServers.h
+++ b/dDatabase/GameDatabase/ITables/IServers.h
@@ -1,21 +0,0 @@
-#ifndef __ISERVERS__H__
-#define __ISERVERS__H__
-
-#include <cstdint>
-#include <optional>
-
-class IServers {
-public:
-	struct MasterInfo {
-		std::string ip;
-		uint32_t port{};
-	};
-
-	// Set the master server ip and port.
-	virtual void SetMasterIp(const std::string_view ip, const uint32_t port) = 0;
-
-	// Get the master server info.
-	virtual std::optional<MasterInfo> GetMasterInfo() = 0;
-};
-
-#endif  //!__ISERVERS__H__
--- a/dDatabase/GameDatabase/ITables/IUgc.h
+++ b/dDatabase/GameDatabase/ITables/IUgc.h
@@ -1,32 +0,0 @@
-#ifndef __IUGC__H__
-#define __IUGC__H__
-
-#include <cstdint>
-#include <sstream>
-#include <optional>
-#include <string>
-#include <string_view>
-
-class IUgc {
-public:
-	struct Model {
-		std::stringstream lxfmlData;
-		LWOOBJID id{};
-	};
-
-	// Gets all UGC models for the given property id.
-	virtual std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) = 0;
-
-	// Gets all Ugcs models.
-	virtual std::vector<IUgc::Model> GetAllUgcModels() = 0;
-	
-	// Removes ugc models that are not referenced by any property.
-	virtual void RemoveUnreferencedUgcModels() = 0;
-
-	// Deletes the ugc model for the given model id.
-	virtual void DeleteUgcModelData(const LWOOBJID& modelId) = 0;
-
-	// Inserts a new UGC model into the database.
-	virtual void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) = 0;
-};
-#endif  //!__IUGC__H__
--- a/dDatabase/GameDatabase/MySQL/CMakeLists.txt
+++ b/dDatabase/GameDatabase/MySQL/CMakeLists.txt
@@ -1,11 +0,0 @@
-SET(DDATABSE_DATABSES_MYSQL_SOURCES
-	"MySQLDatabase.cpp"
-)
-
-add_subdirectory(Tables)
-
-foreach(file ${DDATABASES_DATABASES_MYSQL_TABLES_SOURCES})
-	set(DDATABSE_DATABSES_MYSQL_SOURCES ${DDATABSE_DATABSES_MYSQL_SOURCES} "Tables/${file}")
-endforeach()
-
-set(DDATABSE_DATABSES_MYSQL_SOURCES ${DDATABSE_DATABSES_MYSQL_SOURCES} PARENT_SCOPE)
--- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp
+++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp
@@ -1,113 +0,0 @@
-#include "MySQLDatabase.h"
-
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-
-namespace {
-	std::string databaseName;
-	sql::Properties properties;
-	sql::Driver* driver = nullptr;
-	sql::Connection* con = nullptr;
-};
-
-void MySQLDatabase::Connect() {
-	driver = sql::mariadb::get_driver_instance();
-
-	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
-	// 1) it tries to parse a database from the connection string (like in tcp://localhost:3001/darkflame) based on the
-	//    presence of a /
-	// 2) even avoiding that, the connector still assumes you're connecting with a tcp socket
-	// So, what we do in the presence of a unix socket or pipe is to set the hostname to the protocol and localhost,
-	// which avoids parsing errors while still ensuring the correct connection type is used, and then setting the appropriate
-	// property manually (which the URL parsing fails to do)
-	const std::string UNIX_PROTO = "unix://";
-	const std::string PIPE_PROTO = "pipe://";
-	std::string mysql_host = Game::config->GetValue("mysql_host");
-	if (mysql_host.find(UNIX_PROTO) == 0) {
-		properties["hostName"] = "unix://localhost";
-		properties["localSocket"] = mysql_host.substr(UNIX_PROTO.length()).c_str();
-	} else if (mysql_host.find(PIPE_PROTO) == 0) {
-		properties["hostName"] = "pipe://localhost";
-		properties["pipe"] = mysql_host.substr(PIPE_PROTO.length()).c_str();
-	} else {
-		properties["hostName"] = mysql_host.c_str();
-	}
-	properties["user"] = Game::config->GetValue("mysql_username").c_str();
-	properties["password"] = Game::config->GetValue("mysql_password").c_str();
-	properties["autoReconnect"] = "true";
-
-	databaseName = Game::config->GetValue("mysql_database").c_str();
-
-	// `connect(const Properties& props)` segfaults in windows debug, but
-	// `connect(const SQLString& host, const SQLString& user, const SQLString& pwd)` doesn't handle pipes/unix sockets correctly
-	if (properties.find("localSocket") != properties.end() || properties.find("pipe") != properties.end()) {
-		con = driver->connect(properties);
-	} else {
-		con = driver->connect(properties["hostName"].c_str(), properties["user"].c_str(), properties["password"].c_str());
-	}
-	con->setSchema(databaseName.c_str());
-}
-
-void MySQLDatabase::Destroy(std::string source) {
-	if (!con) return;
-
-	if (source.empty()) LOG("Destroying MySQL connection!");
-	else LOG("Destroying MySQL connection from %s!", source.c_str());
-
-	con->close();
-	delete con;
-	con = nullptr;
-}
-
-void MySQLDatabase::ExecuteCustomQuery(const std::string_view query) {
-	std::unique_ptr<sql::Statement>(con->createStatement())->execute(query.data());
-}
-
-sql::PreparedStatement* MySQLDatabase::CreatePreppedStmt(const std::string& query) {
-	if (!con) {
-		Connect();
-		LOG("Trying to reconnect to MySQL");
-	}
-
-	if (!con->isValid() || con->isClosed()) {
-		delete con;
-
-		con = nullptr;
-
-		Connect();
-		LOG("Trying to reconnect to MySQL from invalid or closed connection");
-	}
-
-	return con->prepareStatement(sql::SQLString(query.c_str(), query.length()));
-}
-
-void MySQLDatabase::Commit() {
-	con->commit();
-}
-
-bool MySQLDatabase::GetAutoCommit() {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	return con->getAutoCommit();
-}
-
-void MySQLDatabase::SetAutoCommit(bool value) {
-	// TODO This should not just access a pointer.  A future PR should update this
-	// to check for null and throw an error if the connection is not valid.
-	con->setAutoCommit(value);
-}
-
-void MySQLDatabase::DeleteCharacter(const uint32_t characterId) {
-	ExecuteDelete("DELETE FROM charxml WHERE id=? LIMIT 1;", characterId);
-	ExecuteDelete("DELETE FROM command_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM friends WHERE player_id=? OR friend_id=?;", characterId, characterId);
-	ExecuteDelete("DELETE FROM leaderboard WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM properties_contents WHERE property_id IN (SELECT id FROM properties WHERE owner_id=?);", characterId);
-	ExecuteDelete("DELETE FROM properties WHERE owner_id=?;", characterId);
-	ExecuteDelete("DELETE FROM ugc WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM activity_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM mail WHERE receiver_id=?;", characterId);
-	ExecuteDelete("DELETE FROM charinfo WHERE id=? LIMIT 1;", characterId);
-}
--- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
+++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
@@ -1,250 +0,0 @@
-#ifndef __MYSQLDATABASE__H__
-#define __MYSQLDATABASE__H__
-
-#include <conncpp.hpp>
-#include <memory>
-
-#include "GameDatabase.h"
-
-typedef std::unique_ptr<sql::PreparedStatement>& UniquePreppedStmtRef;
-
-// Purposefully no definition for this to provide linker errors in the case someone tries to
-// bind a parameter to a type that isn't defined.
-template<typename ParamType>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const ParamType param);
-
-// This is a function to set each parameter in a prepared statement.
-// This is accomplished with a combination of parameter packing and Fold Expressions.
-// The constexpr if statement is used to prevent the compiler from trying to call SetParam with 0 arguments.
-template<typename... Args>
-void SetParams(UniquePreppedStmtRef stmt, Args&&... args) {
-	if constexpr (sizeof...(args) != 0) {
-		int i = 1;
-		(SetParam(stmt, i++, args), ...);
-	}
-}
-
-class MySQLDatabase : public GameDatabase {
-public:
-	void Connect() override;
-	void Destroy(std::string source = "") override;
-
-	sql::PreparedStatement* CreatePreppedStmt(const std::string& query) override;
-	void Commit() override;
-	bool GetAutoCommit() override;
-	void SetAutoCommit(bool value) override;
-	void ExecuteCustomQuery(const std::string_view query) override;
-
-	// Overloaded queries
-	std::optional<IServers::MasterInfo> GetMasterInfo() override;
-
-	std::vector<std::string> GetApprovedCharacterNames() override;
-
-	std::vector<FriendData> GetFriendsList(uint32_t charID) override;
-
-	std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) override;
-	void SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) override;
-	void AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) override;
-	void DeleteUgcModelData(const LWOOBJID& modelId) override;
-	void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) override;
-	std::vector<IUgc::Model> GetAllUgcModels() override;
-	void CreateMigrationHistoryTable() override;
-	bool IsMigrationRun(const std::string_view str) override;
-	void InsertMigration(const std::string_view str) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view charId) override;
-	std::string GetCharacterXml(const uint32_t accountId) override;
-	void UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) override;
-	std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) override;
-	void InsertNewCharacter(const ICharInfo::Info info) override;
-	void InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) override;
-	std::vector<uint32_t> GetAccountCharacterIds(uint32_t accountId) override;
-	void DeleteCharacter(const uint32_t characterId) override;
-	void SetCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void UpdateLastLoggedInCharacter(const uint32_t characterId) override;
-	void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) override;
-	std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) override;
-	std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) override;
-	void UpdatePropertyModerationInfo(const IProperty::Info& info) override;
-	void UpdatePropertyDetails(const IProperty::Info& info) override;
-	void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) override;
-	std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) override;
-	void RemoveUnreferencedUgcModels() override;
-	void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) override;
-	void UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) override;
-	void RemoveModel(const LWOOBJID& modelId) override;
-	void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) override;
-	void InsertNewBugReport(const IBugReports::Info& info) override;
-	void InsertCheatDetection(const IPlayerCheatDetections::Info& info) override;
-	void InsertNewMail(const IMail::MailInfo& mail) override;
-	void InsertNewUgcModel(
-		std::istringstream& sd0Data,
-		const uint32_t blueprintId,
-		const uint32_t accountId,
-		const uint32_t characterId) override;
-	std::vector<IMail::MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) override;
-	std::optional<IMail::MailInfo> GetMail(const uint64_t mailId) override;
-	uint32_t GetUnreadMailCount(const uint32_t characterId) override;
-	void MarkMailRead(const uint64_t mailId) override;
-	void DeleteMail(const uint64_t mailId) override;
-	void ClaimMailItem(const uint64_t mailId) override;
-	void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) override;
-	void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) override;
-	void UpdateAccountBan(const uint32_t accountId, const bool banned) override;
-	void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) override;
-	void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) override;
-	void SetMasterIp(const std::string_view ip, const uint32_t port) override;
-	std::optional<uint32_t> GetCurrentPersistentId() override;
-	void InsertDefaultPersistentId() override;
-	void UpdatePersistentId(const uint32_t id) override;
-	std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) override;
-	std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) override;
-	std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) override;
-	void AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
-	void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
-	std::vector<IIgnoreList::Info> GetIgnoreList(const uint32_t playerId) override;
-	void InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) override;
-	std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) override;
-private:
-
-	// Generic query functions that can be used for any query.
-	// Return type may be different depending on the query, so it is up to the caller to check the return type.
-	// The first argument is the query string, and the rest are the parameters to bind to the query.
-	// The return type is a unique_ptr to the result set, which is deleted automatically when it goes out of scope
-	template<typename... Args>
-	inline std::unique_ptr<sql::ResultSet> ExecuteSelect(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return std::unique_ptr<sql::ResultSet>(preppedStmt->executeQuery()));
-	}
-
-	template<typename... Args>
-	inline void ExecuteDelete(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(preppedStmt->execute());
-	}
-
-	template<typename... Args>
-	inline int32_t ExecuteUpdate(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt->executeUpdate());
-	}
-
-	template<typename... Args>
-	inline bool ExecuteInsert(const std::string& query, Args&&... args) {
-		std::unique_ptr<sql::PreparedStatement> preppedStmt(CreatePreppedStmt(query));
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt->execute());
-	}
-};
-
-// Below are each of the definitions of SetParam for each supported type.
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::string_view param) {
-	// LOG("%s", param.data());
-	stmt->setString(index, param.data());
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const char* param) {
-	// LOG("%s", param);
-	stmt->setString(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::string param) {
-	// LOG("%s", param.c_str());
-	stmt->setString(index, param.c_str());
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int8_t param) {
-	// LOG("%u", param);
-	stmt->setByte(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint8_t param) {
-	// LOG("%d", param);
-	stmt->setByte(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int16_t param) {
-	// LOG("%u", param);
-	stmt->setShort(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint16_t param) {
-	// LOG("%d", param);
-	stmt->setShort(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint32_t param) {
-	// LOG("%u", param);
-	stmt->setUInt(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int32_t param) {
-	// LOG("%d", param);
-	stmt->setInt(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const int64_t param) {
-	// LOG("%llu", param);
-	stmt->setInt64(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const uint64_t param) {
-	// LOG("%llu", param);
-	stmt->setUInt64(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const float param) {
-	// LOG("%f", param);
-	stmt->setFloat(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const double param) {
-	// LOG("%f", param);
-	stmt->setDouble(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const bool param) {
-	// LOG("%d", param);
-	stmt->setBoolean(index, param);
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::istream* param) {
-	// LOG("Blob");
-	// This is the one time you will ever see me use const_cast.
-	stmt->setBlob(index, const_cast<std::istream*>(param));
-}
-
-template<>
-inline void SetParam(UniquePreppedStmtRef stmt, const int index, const std::optional<uint32_t> param) {
-	if (param) {
-		// LOG("%d", param.value());
-		stmt->setInt(index, param.value());
-	} else {
-		// LOG("Null");
-		stmt->setNull(index, sql::DataType::SQLNULL);
-	}
-}
-
-#endif  //!__MYSQLDATABASE__H__
--- a/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
@@ -1,37 +0,0 @@
-#include "MySQLDatabase.h"
-
-#include "eGameMasterLevel.h"
-
-std::optional<IAccounts::Info> MySQLDatabase::GetAccountInfo(const std::string_view username) {
-	auto result = ExecuteSelect("SELECT id, password, banned, locked, play_key_id, gm_level FROM accounts WHERE name = ? LIMIT 1;", username);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IAccounts::Info toReturn;
-	toReturn.id = result->getUInt("id");
-	toReturn.maxGmLevel = static_cast<eGameMasterLevel>(result->getInt("gm_level"));
-	toReturn.bcryptPassword = result->getString("password").c_str();
-	toReturn.banned = result->getBoolean("banned");
-	toReturn.locked = result->getBoolean("locked");
-	toReturn.playKeyId = result->getUInt("play_key_id");
-
-	return toReturn;
-}
-
-void MySQLDatabase::UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) {
-	ExecuteUpdate("UPDATE accounts SET mute_expire = ? WHERE id = ?;", timeToUnmute, accountId);
-}
-
-void MySQLDatabase::UpdateAccountBan(const uint32_t accountId, const bool banned) {
-	ExecuteUpdate("UPDATE accounts SET banned = ? WHERE id = ?;", banned, accountId);
-}
-
-void MySQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) {
-	ExecuteUpdate("UPDATE accounts SET password = ? WHERE id = ?;", bcryptpassword, accountId);
-}
-
-void MySQLDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
-	ExecuteInsert("INSERT INTO accounts (name, password, gm_level) VALUES (?, ?, ?);", username, bcryptpassword, static_cast<int32_t>(eGameMasterLevel::OPERATOR));
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/AccountsRewardCodes.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/AccountsRewardCodes.cpp
@@ -1,17 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) {
-	ExecuteInsert("INSERT IGNORE INTO accounts_rewardcodes (account_id, rewardcode) VALUES (?, ?);", account_id, reward_code);
-}
-
-std::vector<uint32_t> MySQLDatabase::GetRewardCodesByAccountID(const uint32_t account_id) {
-	auto result = ExecuteSelect("SELECT rewardcode FROM accounts_rewardcodes WHERE account_id = ?;", account_id);
-
-	std::vector<uint32_t> toReturn;
-	toReturn.reserve(result->rowsCount());
-	while (result->next()) {
-		toReturn.push_back(result->getUInt("rewardcode"));
-	}
-
-	return toReturn;
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/ActivityLog.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/ActivityLog.cpp
@@ -1,6 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) {
-	ExecuteInsert("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);",
-		characterId, static_cast<uint32_t>(activityType), static_cast<uint32_t>(time(NULL)), mapId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/BugReports.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/BugReports.cpp
@@ -1,6 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertNewBugReport(const IBugReports::Info& info) {
-	ExecuteInsert("INSERT INTO `bug_reports`(body, client_version, other_player_id, selection, reporter_id) VALUES (?, ?, ?, ?, ?)",
-		info.body, info.clientVersion, info.otherPlayer, info.selection, info.characterId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt
+++ b/dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt
@@ -1,24 +0,0 @@
-set(DDATABASES_DATABASES_MYSQL_TABLES_SOURCES
-	"Accounts.cpp"
-	"AccountsRewardCodes.cpp"
-	"ActivityLog.cpp"
-	"BugReports.cpp"
-	"CharInfo.cpp"
-	"CharXml.cpp"
-	"CommandLog.cpp"
-	"Friends.cpp"
-	"IgnoreList.cpp"
-	"Leaderboard.cpp"
-	"Mail.cpp"
-	"MigrationHistory.cpp"
-	"ObjectIdTracker.cpp"
-	"PetNames.cpp"
-	"PlayerCheatDetections.cpp"
-	"PlayKeys.cpp"
-	"Property.cpp"
-	"PropertyContents.cpp"
-	"Servers.cpp"
-	"Ugc.cpp"
-	PARENT_SCOPE
-)
-
--- a/dDatabase/GameDatabase/MySQL/Tables/CharInfo.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/CharInfo.cpp
@@ -1,78 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<std::string> MySQLDatabase::GetApprovedCharacterNames() {
-	auto result = ExecuteSelect("SELECT name FROM charinfo;");
-
-	std::vector<std::string> toReturn;
-
-	while (result->next()) {
-		toReturn.push_back(result->getString("name").c_str());
-	}
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> CharInfoFromQueryResult(std::unique_ptr<sql::ResultSet> stmt) {
-	if (!stmt->next()) {
-		return std::nullopt;
-	}
-
-	ICharInfo::Info toReturn;
-
-	toReturn.id = stmt->getUInt("id");
-	toReturn.name = stmt->getString("name").c_str();
-	toReturn.pendingName = stmt->getString("pending_name").c_str();
-	toReturn.needsRename = stmt->getBoolean("needs_rename");
-	toReturn.cloneId = stmt->getUInt64("prop_clone_id");
-	toReturn.accountId = stmt->getUInt("account_id");
-	toReturn.permissionMap = static_cast<ePermissionMap>(stmt->getUInt("permission_map"));
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> MySQLDatabase::GetCharacterInfo(const uint32_t charId) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE id = ? LIMIT 1;", charId)
-	);
-}
-
-std::optional<ICharInfo::Info> MySQLDatabase::GetCharacterInfo(const std::string_view name) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE name = ? LIMIT 1;", name)
-	);
-}
-
-std::vector<uint32_t> MySQLDatabase::GetAccountCharacterIds(const uint32_t accountId) {
-	auto result = ExecuteSelect("SELECT id FROM charinfo WHERE account_id = ? ORDER BY last_login DESC LIMIT 4;", accountId);
-
-	std::vector<uint32_t> toReturn;
-	toReturn.reserve(result->rowsCount());
-	while (result->next()) {
-		toReturn.push_back(result->getUInt("id"));
-	}
-
-	return toReturn;
-}
-
-void MySQLDatabase::InsertNewCharacter(const ICharInfo::Info info) {
-	ExecuteInsert(
-		"INSERT INTO `charinfo`(`id`, `account_id`, `name`, `pending_name`, `needs_rename`, `last_login`) VALUES (?,?,?,?,?,?)",
-		info.id,
-		info.accountId,
-		info.name,
-		info.pendingName,
-		false,
-		static_cast<uint32_t>(time(NULL)));
-}
-
-void MySQLDatabase::SetCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET name = ?, pending_name = '', needs_rename = 0, last_login = ? WHERE id = ? LIMIT 1;", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void MySQLDatabase::SetPendingCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET pending_name = ?, needs_rename = 0, last_login = ? WHERE id = ? LIMIT 1", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void MySQLDatabase::UpdateLastLoggedInCharacter(const uint32_t characterId) {
-	ExecuteUpdate("UPDATE charinfo SET last_login = ? WHERE id = ? LIMIT 1", static_cast<uint32_t>(time(NULL)), characterId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/CharXml.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/CharXml.cpp
@@ -1,19 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::string MySQLDatabase::GetCharacterXml(const uint32_t charId) {
-	auto result = ExecuteSelect("SELECT xml_data FROM charxml WHERE id = ? LIMIT 1;", charId);
-
-	if (!result->next()) {
-		return "";
-	}
-
-	return result->getString("xml_data").c_str();
-}
-
-void MySQLDatabase::UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) {
-	ExecuteUpdate("UPDATE charxml SET xml_data = ? WHERE id = ?;", lxfml, charId);
-}
-
-void MySQLDatabase::InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) {
-	ExecuteInsert("INSERT INTO `charxml` (`id`, `xml_data`) VALUES (?,?)", characterId, lxfml);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/CommandLog.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/CommandLog.cpp
@@ -1,5 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) {
-	ExecuteInsert("INSERT INTO command_log (character_id, command) VALUES (?, ?);", characterId, command);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/Friends.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Friends.cpp
@@ -1,73 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<FriendData> MySQLDatabase::GetFriendsList(const uint32_t charId) {
-	auto friendsList = ExecuteSelect(
-		R"QUERY(
-			SELECT fr.requested_player AS player, best_friend AS bff, ci.name AS name FROM 
-			(
-				SELECT CASE 
-				WHEN player_id = ? THEN friend_id 
-				WHEN friend_id = ? THEN player_id 
-				END AS requested_player, best_friend FROM friends
-			) AS fr 
-			JOIN charinfo AS ci ON ci.id = fr.requested_player 
-			WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;
-		)QUERY", charId, charId, charId);
-
-	std::vector<FriendData> toReturn;
-	toReturn.reserve(friendsList->rowsCount());
-
-	while (friendsList->next()) {
-		FriendData fd;
-		fd.friendID = friendsList->getUInt("player");
-		fd.isBestFriend = friendsList->getInt("bff") == 3; // 0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
-		fd.friendName = friendsList->getString("name").c_str();
-
-		toReturn.push_back(fd);
-	}
-
-	return toReturn;
-}
-
-std::optional<IFriends::BestFriendStatus> MySQLDatabase::GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	auto result = ExecuteSelect("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IFriends::BestFriendStatus toReturn;
-	toReturn.playerCharacterId = result->getUInt("player_id");
-	toReturn.friendCharacterId = result->getUInt("friend_id");
-	toReturn.bestFriendStatus = result->getUInt("best_friend");
-
-	return toReturn;
-}
-
-void MySQLDatabase::SetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId, const uint32_t bestFriendStatus) {
-	ExecuteUpdate("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		bestFriendStatus,
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}
-
-void MySQLDatabase::AddFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteInsert("INSERT IGNORE INTO friends (player_id, friend_id, best_friend) VALUES (?, ?, 0);", playerCharacterId, friendCharacterId);
-}
-
-void MySQLDatabase::RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteDelete("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/IgnoreList.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/IgnoreList.cpp
@@ -1,22 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::vector<IIgnoreList::Info> MySQLDatabase::GetIgnoreList(const uint32_t playerId) {
-	auto result = ExecuteSelect("SELECT ci.name AS name, il.ignored_player_id AS ignore_id FROM ignore_list AS il JOIN charinfo AS ci ON il.ignored_player_id = ci.id WHERE il.player_id = ?", playerId);
-
-	std::vector<IIgnoreList::Info> ignoreList;
-
-	ignoreList.reserve(result->rowsCount());
-	while (result->next()) {
-		ignoreList.push_back(IIgnoreList::Info{ result->getString("name").c_str(), result->getUInt("ignore_id") });
-	}
-
-	return ignoreList;
-}
-
-void MySQLDatabase::AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-	ExecuteInsert("INSERT IGNORE INTO ignore_list (player_id, ignored_player_id) VALUES (?, ?)", playerId, ignoredPlayerId);
-}
-
-void MySQLDatabase::RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-	ExecuteDelete("DELETE FROM ignore_list WHERE player_id = ? AND ignored_player_id = ?", playerId, ignoredPlayerId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/Leaderboard.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Leaderboard.cpp
@@ -1,11 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<uint32_t> MySQLDatabase::GetDonationTotal(const uint32_t activityId) {
-	auto donation_total = ExecuteSelect("SELECT SUM(primaryScore) as donation_total FROM leaderboard WHERE game_id = ?;", activityId);
-
-	if (!donation_total->next()) {
-		return std::nullopt;
-	}
-
-	return donation_total->getUInt("donation_total");
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/Mail.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Mail.cpp
@@ -1,83 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertNewMail(const IMail::MailInfo& mail) {
-	ExecuteInsert(
-		"INSERT INTO `mail` "
-		"(`sender_id`, `sender_name`, `receiver_id`, `receiver_name`, `time_sent`, `subject`, `body`, `attachment_id`, `attachment_lot`, `attachment_subkey`, `attachment_count`, `was_read`)"
-		" VALUES (?,?,?,?,?,?,?,?,?,?,?,0)",
-		mail.senderId,
-		mail.senderUsername,
-		mail.receiverId,
-		mail.recipient,
-		static_cast<uint32_t>(time(NULL)),
-		mail.subject,
-		mail.body,
-		mail.itemID,
-		mail.itemLOT,
-		0,
-		mail.itemCount);
-}
-
-std::vector<IMail::MailInfo> MySQLDatabase::GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) {
-	auto res = ExecuteSelect(
-		"SELECT id, subject, body, sender_name, attachment_id, attachment_lot, attachment_subkey, attachment_count, was_read, time_sent"
-		" FROM mail WHERE receiver_id=? limit ?;",
-		characterId, numberOfMail);
-
-	std::vector<IMail::MailInfo> toReturn;
-	toReturn.reserve(res->rowsCount());
-
-	while (res->next()) {
-		IMail::MailInfo mail;
-		mail.id = res->getUInt64("id");
-		mail.subject = res->getString("subject").c_str();
-		mail.body = res->getString("body").c_str();
-		mail.senderUsername = res->getString("sender_name").c_str();
-		mail.itemID = res->getUInt("attachment_id");
-		mail.itemLOT = res->getInt("attachment_lot");
-		mail.itemSubkey = res->getInt("attachment_subkey");
-		mail.itemCount = res->getInt("attachment_count");
-		mail.timeSent = res->getUInt64("time_sent");
-		mail.wasRead = res->getBoolean("was_read");
-
-		toReturn.push_back(std::move(mail));
-	}
-
-	return toReturn;
-}
-
-std::optional<IMail::MailInfo> MySQLDatabase::GetMail(const uint64_t mailId) {
-	auto res = ExecuteSelect("SELECT attachment_lot, attachment_count FROM mail WHERE id=? LIMIT 1;", mailId);
-
-	if (!res->next()) {
-		return std::nullopt;
-	}
-
-	IMail::MailInfo toReturn;
-	toReturn.itemLOT = res->getInt("attachment_lot");
-	toReturn.itemCount = res->getInt("attachment_count");
-
-	return toReturn;
-}
-
-uint32_t MySQLDatabase::GetUnreadMailCount(const uint32_t characterId) {
-	auto res = ExecuteSelect("SELECT COUNT(*) AS number_unread FROM mail WHERE receiver_id=? AND was_read=0;", characterId);
-
-	if (!res->next()) {
-		return 0;
-	}
-
-	return res->getInt("number_unread");
-}
-
-void MySQLDatabase::MarkMailRead(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET was_read=1 WHERE id=? LIMIT 1;", mailId);
-}
-
-void MySQLDatabase::ClaimMailItem(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET attachment_lot=0 WHERE id=? LIMIT 1;", mailId);
-}
-
-void MySQLDatabase::DeleteMail(const uint64_t mailId) {
-	ExecuteDelete("DELETE FROM mail WHERE id=? LIMIT 1;", mailId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/MigrationHistory.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/MigrationHistory.cpp
@@ -1,13 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::CreateMigrationHistoryTable() {
-	ExecuteInsert("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP());");
-}
-
-bool MySQLDatabase::IsMigrationRun(const std::string_view str) {
-	return ExecuteSelect("SELECT name FROM migration_history WHERE name = ?;", str)->next();
-}
-
-void MySQLDatabase::InsertMigration(const std::string_view str) {
-	ExecuteInsert("INSERT INTO migration_history (name) VALUES (?);", str);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/ObjectIdTracker.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/ObjectIdTracker.cpp
@@ -1,17 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<uint32_t> MySQLDatabase::GetCurrentPersistentId() {
-	auto result = ExecuteSelect("SELECT last_object_id FROM object_id_tracker");
-	if (!result->next()) {
-		return std::nullopt;
-	}
-	return result->getUInt("last_object_id");
-}
-
-void MySQLDatabase::InsertDefaultPersistentId() {
-	ExecuteInsert("INSERT INTO object_id_tracker VALUES (1);");
-}
-
-void MySQLDatabase::UpdatePersistentId(const uint32_t newId) {
-	ExecuteUpdate("UPDATE object_id_tracker SET last_object_id = ?;", newId);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/PetNames.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/PetNames.cpp
@@ -1,26 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO `pet_names` (`id`, `pet_name`, `approved`) VALUES (?, ?, ?) "
-		"ON DUPLICATE KEY UPDATE pet_name = ?, approved = ?;",
-		petId,
-		info.petName,
-		info.approvalStatus,
-		info.petName,
-		info.approvalStatus);
-}
-
-std::optional<IPetNames::Info> MySQLDatabase::GetPetNameInfo(const LWOOBJID& petId) {
-	auto result = ExecuteSelect("SELECT pet_name, approved FROM pet_names WHERE id = ? LIMIT 1;", petId);
-
-	if (!result->next()) {
-		return std::nullopt;
-	}
-
-	IPetNames::Info toReturn;
-	toReturn.petName = result->getString("pet_name").c_str();
-	toReturn.approvalStatus = result->getInt("approved");
-
-	return toReturn;
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/PlayKeys.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/PlayKeys.cpp
@@ -1,11 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<bool> MySQLDatabase::IsPlaykeyActive(const int32_t playkeyId) {
-	auto keyCheckRes = ExecuteSelect("SELECT active FROM `play_keys` WHERE id=?", playkeyId);
-
-	if (!keyCheckRes->next()) {
-		return std::nullopt;
-	}
-
-	return keyCheckRes->getBoolean("active");
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/PlayerCheatDetections.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/PlayerCheatDetections.cpp
@@ -1,7 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertCheatDetection(const IPlayerCheatDetections::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO player_cheat_detections (account_id, name, violation_msg, violation_system_address) VALUES (?, ?, ?, ?)",
-		info.userId, info.username, info.extraMessage, info.systemAddress);
-}
--- a/dDatabase/GameDatabase/MySQL/Tables/Property.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Property.cpp
@@ -1,57 +0,0 @@
-#include "MySQLDatabase.h"
-
-std::optional<IProperty::Info> MySQLDatabase::GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) {
-	auto propertyEntry = ExecuteSelect(
-		"SELECT id, owner_id, clone_id, name, description, privacy_option, rejection_reason, last_updated, time_claimed, reputation, mod_approved "
-		"FROM properties WHERE zone_id = ? AND clone_id = ?;", mapId, cloneId);
-
-	if (!propertyEntry->next()) {
-		return std::nullopt;
-	}
-
-	IProperty::Info toReturn;
-	toReturn.id = propertyEntry->getUInt64("id");
-	toReturn.ownerId = propertyEntry->getUInt64("owner_id");
-	toReturn.cloneId = propertyEntry->getUInt64("clone_id");
-	toReturn.name = propertyEntry->getString("name").c_str();
-	toReturn.description = propertyEntry->getString("description").c_str();
-	toReturn.privacyOption = propertyEntry->getInt("privacy_option");
-	toReturn.rejectionReason = propertyEntry->getString("rejection_reason").c_str();
-	toReturn.lastUpdatedTime = propertyEntry->getUInt("last_updated");
-	toReturn.claimedTime = propertyEntry->getUInt("time_claimed");
-	toReturn.reputation = propertyEntry->getUInt("reputation");
-	toReturn.modApproved = propertyEntry->getUInt("mod_approved");
-
-	return toReturn;
-}
-
-void MySQLDatabase::UpdatePropertyModerationInfo(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET privacy_option = ?, rejection_reason = ?, mod_approved = ? WHERE id = ? LIMIT 1;",
-		info.privacyOption,
-		info.rejectionReason,
-		info.modApproved,
-		info.id);
-}
-
-void MySQLDatabase::UpdatePropertyDetails(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET name = ?, description = ? WHERE id = ? LIMIT 1;", info.name, info.description, info.id);
-}
-
-void MySQLDatabase::UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) {
-	ExecuteUpdate("UPDATE properties SET performance_cost = ? WHERE zone_id = ? AND clone_id = ? LIMIT 1;", performanceCost, zoneId.GetMapID(), zoneId.GetCloneID());
-}
-
-void MySQLDatabase::InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) {
-	auto insertion = ExecuteInsert(
-		"INSERT INTO properties"
-		"(id, owner_id, template_id, clone_id, name, description, zone_id, rent_amount, rent_due, privacy_option, last_updated, time_claimed, rejection_reason, reputation, performance_cost)"
-		"VALUES (?, ?, ?, ?, ?, ?, ?, 0, 0, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP(), '', 0, 0.0)",
-		info.id,
-		info.ownerId,
-		templateId,
-		zoneId.GetCloneID(),
-		info.name,
-		info.description,
-		zoneId.GetMapID()
-	);
-}
--- a/Show More
+++ b/Show More