add deep copy of config data

Revert "fix stale reference"

This reverts commit 03b17c0374787bca6dfec2da663da74ac76c26fb.

fix stale reference

.editorconfig

@@ -73,4 +73,4 @@ cpp_space_around_assignment_operator=insert
 cpp_space_pointer_reference_alignment=left
 cpp_space_around_ternary_operator=insert
 cpp_wrap_preserve_blocks=one_liners
-cpp_indent_comment=false
+cpp_indent_comment=fasle

.env.example

@@ -3,7 +3,7 @@ CLIENT_PATH=./client
 # Updates NET_VERSION in CMakeVariables.txt
 NET_VERSION=171022
 # make sure this is a long random string
-# generate a "SHA 256-bit Key" from here: https://gchq.github.io/CyberChef/#recipe=Pseudo-Random_Number_Generator(256,'Hex')
+# grab a "SHA 256-bit Key" from here: https://keygen.io/
 ACCOUNT_MANAGER_SECRET=
 # Should be the externally facing IP of your server host
 EXTERNAL_IP=localhost

.github/workflows/build-and-test.yml

@@ -16,12 +16,12 @@ jobs:
         os: [ windows-2022, ubuntu-22.04, macos-13 ]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Add msbuild to PATH (Windows only)
       if: ${{ matrix.os == 'windows-2022' }}
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v1.1
       with:
         vs-version: '[17,18)'
         msbuild-architecture: x64
@@ -33,20 +33,21 @@ jobs:
     - name: cmake
       uses: lukka/run-cmake@v10
       with:
-        workflowPreset: "ci-${{matrix.os}}"
+        configurePreset: "ci-${{matrix.os}}"
+        buildPreset: "ci-${{matrix.os}}"
+        testPreset: "ci-${{matrix.os}}"
     - name: artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: build-${{matrix.os}}
         path: |
-          build/*/*Server*
-          build/*/*.ini
-          build/*/*.so
-          build/*/*.dll
-          build/*/*.dylib
-          build/*/vanity/
-          build/*/navmeshes/
-          build/*/migrations/
-          build/*/*.dcf
-          !build/*/*.pdb
-          !build/*/d*/
+          build/*Server*
+          build/*.ini
+          build/*.so
+          build/*.dll
+          build/vanity/
+          build/navmeshes/
+          build/migrations/
+          build/*.dcf
+          !build/*.pdb
+          !build/d*/

.gitignore

@@ -4,7 +4,6 @@ RelWithDebInfo/
 docker/configs
 
 # Third party libraries
-thirdparty/magic_enum
 thirdparty/mysql/
 thirdparty/mysql_linux/
 CMakeVariables.txt
@@ -96,7 +95,6 @@ ipch/
 
 # Exceptions:
 CMakeSettings.json
-CMakeUserPresets.json
 *.vcxproj
 *.filters
 *.cmake
@@ -124,7 +122,4 @@ docker/__pycache__
 docker-compose.override.yml
 
 !*Test.bin
-
-# CMake scripts
 !cmake/*
-!cmake/toolchains/*

.gitmodules

@@ -14,3 +14,6 @@
 	path = thirdparty/mariadb-connector-cpp
 	url = https://github.com/mariadb-corporation/mariadb-connector-cpp.git
 	ignore = dirty
+[submodule "thirdparty/magic_enum"]
+	path = thirdparty/magic_enum
+	url = https://github.com/Neargye/magic_enum.git

CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(Darkflame
-	HOMEPAGE_URL "https://github.com/DarkflameUniverse/DarkflameServer"
-	LANGUAGES C CXX
-)
+project(Darkflame)
 
 # check if the path to the source directory contains a space
 if("${CMAKE_SOURCE_DIR}" MATCHES " ")
@@ -11,10 +8,8 @@ endif()
 
 include(CTest)
 
-set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) 	# Export the compile commands for debugging
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) 	# Set CMAKE visibility policy to NEW on project and subprojects
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Set C and C++ symbol visibility to hide inlined functions
@@ -66,37 +61,35 @@ set(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "" FORCE)
 # Disabled no-register
 # Disabled unknown pragmas because Linux doesn't understand Windows pragmas.
 if(UNIX)
-	add_link_options("-Wl,-rpath,$ORIGIN/")
-	add_compile_options("-fPIC")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wuninitialized -fPIC")
 	add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0 _GLIBCXX_USE_CXX17_ABI=0)
 
-	# For all except Clang and Apple Clang
-	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		add_compile_options("-static-libgcc" "-lstdc++fs")
+	if(NOT APPLE)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -lstdc++fs")
 	endif()
 
 	if(${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-		add_link_options("-export-dynamic")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -rdynamic")
 	endif()
 
 	if(${GGDB})
-		add_compile_options("-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
 	# Also disable non-portable MSVC volatile behavior
-	add_compile_options("/wd4267" "/utf-8" "/volatile:iso" "/Zc:inline")
+	add_compile_options("/wd4267" "/utf-8" "/volatile:iso")
 elseif(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
 # Our output dir
+set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
 #set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process
 
 # TODO make this not have to override the build type directories
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
@@ -110,62 +103,37 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 find_package(MariaDB)
 
-# Fetch third party dependencies
-set(DLU_THIRDPARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty)
-
-include(FetchContent)
-FetchContent_Declare(
-	magic_enum
-	SYSTEM
-	# SOURCE_DIR     ${DLU_THIRDPARTY_SOURCE_DIR}/magic_enum
-	GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
-	GIT_TAG        v0.9.7
-)
-FetchContent_MakeAvailable(magic_enum)
-
-include(CMakePrintHelpers)
-cmake_print_properties(TARGETS magic_enum::magic_enum PROPERTIES
-                       INTERFACE_INCLUDE_DIRECTORIES)
-
 # Create a /resServer directory
 make_directory(${CMAKE_BINARY_DIR}/resServer)
 
 # Create a /logs directory
 make_directory(${CMAKE_BINARY_DIR}/logs)
 
-# Get DLU config directory
-if(DEFINED ENV{DLU_CONFIG_DIR})
-	set(DLU_CONFIG_DIR $ENV{DLU_CONFIG_DIR})
-else()
-	set(DLU_CONFIG_DIR ${PROJECT_BINARY_DIR})
-endif()
-message(STATUS "Variable: DLU_CONFIG_DIR = ${DLU_CONFIG_DIR}")
-
 # Copy resource files on first build
 set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blocklist.dcf")
 message(STATUS "Checking resource file integrity")
 
 include(Utils)
-UpdateConfigOption(${DLU_CONFIG_DIR}/authconfig.ini "port" "auth_server_port")
-UpdateConfigOption(${DLU_CONFIG_DIR}/chatconfig.ini "port" "chat_server_port")
-UpdateConfigOption(${DLU_CONFIG_DIR}/masterconfig.ini "port" "master_server_port")
+UpdateConfigOption(${PROJECT_BINARY_DIR}/authconfig.ini "port" "auth_server_port")
+UpdateConfigOption(${PROJECT_BINARY_DIR}/chatconfig.ini "port" "chat_server_port")
+UpdateConfigOption(${PROJECT_BINARY_DIR}/masterconfig.ini "port" "master_server_port")
 
 foreach(resource_file ${RESOURCE_FILES})
 	set(file_size 0)
 
-	if(EXISTS ${DLU_CONFIG_DIR}/${resource_file})
-		file(SIZE ${DLU_CONFIG_DIR}/${resource_file} file_size)
+	if(EXISTS ${PROJECT_BINARY_DIR}/${resource_file})
+		file(SIZE ${PROJECT_BINARY_DIR}/${resource_file} file_size)
 	endif()
 
 	if(${file_size} EQUAL 0)
 		configure_file(
-			${CMAKE_SOURCE_DIR}/resources/${resource_file} ${DLU_CONFIG_DIR}/${resource_file}
+			${CMAKE_SOURCE_DIR}/resources/${resource_file} ${PROJECT_BINARY_DIR}/${resource_file}
 			COPYONLY
 		)
-		message(STATUS "Moved " ${resource_file} " to DLU config directory")
+		message(STATUS "Moved " ${resource_file} " to project binary directory")
 	elseif(resource_file MATCHES ".ini")
 		message(STATUS "Checking " ${resource_file} " for missing config options")
-		file(READ ${DLU_CONFIG_DIR}/${resource_file} current_file_contents)
+		file(READ ${PROJECT_BINARY_DIR}/${resource_file} current_file_contents)
 		string(REPLACE "\\\n" "" current_file_contents ${current_file_contents})
 		string(REPLACE "\n" ";" current_file_contents ${current_file_contents})
 		set(parsed_current_file_contents "")
@@ -196,10 +164,10 @@ foreach(resource_file ${RESOURCE_FILES})
 					set(line_to_add ${line_to_add} ${line})
 
 					foreach(line_to_append ${line_to_add})
-						file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n" ${line_to_append})
+						file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n" ${line_to_append})
 					endforeach()
 
-					file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n")
+					file(APPEND ${PROJECT_BINARY_DIR}/${resource_file} "\n")
 				endif()
 
 				set(line_to_add "")
@@ -268,14 +236,14 @@ include_directories(
 	"tests/dGameTests"
 	"tests/dGameTests/dComponentsTests"
 
-	SYSTEM
-	"thirdparty/raknet/Source"
-	"thirdparty/tinyxml2"
-	"thirdparty/recastnavigation"
-	"thirdparty/SQLite"
-	"thirdparty/cpplinq"
-	"thirdparty/cpp-httplib"
-	"thirdparty/MD5"
+	SYSTEM "thirdparty/magic_enum/include/magic_enum"
+	SYSTEM "thirdparty/raknet/Source"
+	SYSTEM "thirdparty/tinyxml2"
+	SYSTEM "thirdparty/recastnavigation"
+	SYSTEM "thirdparty/SQLite"
+	SYSTEM "thirdparty/cpplinq"
+	SYSTEM "thirdparty/cpp-httplib"
+	SYSTEM "thirdparty/MD5"
 )
 
 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
@@ -284,17 +252,10 @@ if(APPLE)
 	include_directories("/usr/local/include/")
 endif()
 
-# Set warning flags
-if(MSVC)
-	# add_compile_options("/W4")
-	# Want to enable warnings eventually, but WAY too much noise right now
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
-	add_compile_options("-Wuninitialized" "-Wold-style-cast")
-else()
-	message(WARNING "Unknown compiler: '${CMAKE_CXX_COMPILER_ID}' - No warning flags enabled.")
-endif()
-
 # Add linking directories:
+if (UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Werror") # Warning flags
+endif()
 file(
 	GLOB HEADERS_DZONEMANAGER
 	LIST_DIRECTORIES false
@@ -319,7 +280,6 @@ file(
 # Add our library subdirectories for creation of the library object
 add_subdirectory(dCommon)
 add_subdirectory(dDatabase)
-add_subdirectory(dECS)
 add_subdirectory(dChatFilter)
 add_subdirectory(dNet)
 add_subdirectory(dScripts) # Add for dGame to use
@@ -330,7 +290,7 @@ add_subdirectory(dPhysics)
 add_subdirectory(dServer)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "magic_enum::magic_enum")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum")
 
 # Add platform specific common libraries
 if(UNIX)

CMakePresets.json

@@ -1,8 +1,8 @@
 {
-	"version": 6,
+    "version": 3,
     "cmakeMinimumRequired": {
       "major": 3,
-		"minor": 25,
+      "minor": 14,
       "patch": 0
     },
     "configurePresets": [
@@ -14,154 +14,40 @@
         "generator": "Unix Makefiles"
       },
       {
-			"name": "debug-config",
-			"hidden": true,
-			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
-			}
+        "name": "ci-ubuntu-22.04",
+        "displayName": "CI configure step for Ubuntu",
+        "description": "Same as default, Used in GitHub actions workflow",
+        "inherits": "default"
       },
       {
-			"name": "relwithdebinfo-config",
-			"hidden": true,
+        "name": "ci-macos-13",
+        "displayName": "CI configure step for MacOS",
+        "description": "Same as default, Used in GitHub actions workflow",
+        "inherits": "default"
+      },
+      {
+        "name": "ci-windows-2022",
+        "displayName": "CI configure step for Windows",
+        "description": "Set architecture to 64-bit (b/c RakNet)",
+        "inherits": "default",
+        "generator": "Visual Studio 17 2022",
+        "architecture": {
+          "value": "x64"
+        },
         "cacheVariables": {
           "CMAKE_BUILD_TYPE": "RelWithDebInfo"
         }
       },
-		{
-			"name": "release-config",
-			"hidden": true,
-			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
-			}
-		},
-		{
-			"name": "clang-config",
-			"hidden": true,
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake"
-		},
-		{
-			"name": "gnu-config",
-			"hidden": true,
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake"
-		},
-		{
-			"name": "windows-msvc",
-			"inherits": "default",
-			"displayName": "[Multi] Windows (MSVC)",
-			"description": "Set architecture to 64-bit (b/c RakNet)",
-			"generator": "Visual Studio 17 2022",
-			"binaryDir": "${sourceDir}/build/msvc",
-			"architecture": {
-				"value": "x64"
-			},
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Windows"
-			}
-		},
       {
         "name": "windows-default",
-			"inherits": "windows-msvc",
+        "inherits": "ci-windows-2022",
         "displayName": "Windows only Configure Settings",
         "description": "Sets build and install directories",
         "generator": "Ninja",
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Windows"
-			},
         "architecture": {
-				"value": "x64"
+          "value": "x64",
+          "strategy": "external"
         }
-		},
-		{
-			"name": "linux-config",
-			"inherits": "default",
-			"hidden": true,
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Linux"
-			}
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"debug-config"
-			],
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Create a debug build using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-debug"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"relwithdebinfo-config"
-			],
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Create a release build with debug info using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-relwithdebinfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"release-config"
-			],
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Create a release build using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"debug-config"
-			],
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "Create a debug build using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-debug"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"relwithdebinfo-config"
-			],
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "Create a release build with debug info using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-relwithdebinfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"release-config"
-			],
-			"displayName": "[Release] Linux (GNU)",
-			"description": "Create a release build using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-release"
-		},
-		{
-			"name": "macos",
-			"inherits": "default",
-			"displayName": "[Multi] MacOS",
-			"description": "Create a build for MacOS",
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Darwin"
-			},
-			"binaryDir": "${sourceDir}/build/macos"
       }
     ],
     "buildPresets": [
@@ -173,106 +59,34 @@
         "jobs": 2
       },
       {
-			"name": "windows-msvc-debug",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
-			"configuration": "Debug"
+        "name": "ci-windows-2022",
+        "configurePreset": "ci-windows-2022",
+        "displayName": "Windows CI Build",
+        "description": "This preset is used by the CI build on windows",
+        "configuration": "RelWithDebInfo",
+        "jobs": 2
       },
       {
-			"name": "windows-msvc-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
-			"configuration": "RelWithDebInfo"
+        "name": "ci-ubuntu-22.04",
+        "configurePreset": "ci-ubuntu-22.04",
+        "displayName": "Linux CI Build",
+        "description": "This preset is used by the CI build on linux",
+        "jobs": 2
       },
       {
-			"name": "windows-msvc-release",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "This preset is used to build in release mode using the MSVC toolchain on Windows",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": "default",
-			"configurePreset": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "This preset is used to build in debug mode using the Clang toolchain on Linux",
-			"configuration": "Debug"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "This preset is used to build in release mode with debug info using the Clang toolchain on Linux",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": "default",
-			"configurePreset": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "This preset is used to build in release mode using the Clang toolchain on Linux",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "This preset is used to build in debug mode using the GNU toolchain on Linux",
-			"configuration": "Debug"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "This preset is used to build in release mode with debug info using the GNU toolchain on Linux",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-release",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "This preset is used to build in release mode using the GNU toolchain on Linux",
-			"configuration": "Release"
-		},
-		{
-			"name": "macos-debug",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Debug] MacOS",
-			"description": "This preset is used to build in debug mode on MacOS",
-			"configuration": "Debug"
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "This preset is used to build in release mode with debug info on MacOS",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "macos-release",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Release] MacOS",
-			"description": "This preset is used to build in release mode on MacOS",
-			"configuration": "Release"
+        "name": "ci-macos-13",
+        "configurePreset": "ci-macos-13",
+        "displayName": "MacOS CI Build",
+        "description": "This preset is used by the CI build on MacOS",
+        "jobs": 2
       }
     ],
     "testPresets": [
       {
-			"name": "default",
-			"configurePreset": "default",
+        "name": "ci-ubuntu-22.04",
+        "configurePreset": "ci-ubuntu-22.04",
+        "displayName": "CI Tests on Linux",
+        "description": "Runs all tests on a linux configuration",
 		"execution": {
 			"jobs": 2
 		},
@@ -281,358 +95,34 @@
         }
       },
       {
-			"name": "windows-msvc-test",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"hidden": true,
+        "name": "ci-macos-13",
+        "configurePreset": "ci-macos-13",
+        "displayName": "CI Tests on MacOS",
+        "description": "Runs all tests on a Mac configuration",
+		"execution": {
+			"jobs": 2
+		},
+        "output": {
+          "outputOnFailure": true
+        }
+      },
+      {
+        "name": "ci-windows-2022",
+        "configurePreset": "ci-windows-2022",
+        "displayName": "CI Tests on windows",
+        "description": "Runs all tests on a windows configuration",
+		"configuration": "RelWithDebInfo",
+		"execution": {
+			"jobs": 2
+		},
+        "output": {
+          "outputOnFailure": true
+        },
 		"filter": {
 			"exclude": {
 				"name": "((example)|(minigzip))+"
 			}
 		}
-		},
-		{
-			"name": "windows-msvc-debug",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "Debug"
-		},
-		{
-			"name": "windows-msvc-relwithdebinfo",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "windows-msvc-release",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": "default",
-			"configurePreset": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": "default",
-			"configurePreset": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-release",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "macos-debug",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Debug] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "Debug"
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "macos-release",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Release] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "Release"
-		}
-	],
-	"workflowPresets": [
-		{
-			"name": "default",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "default"
-				},
-				{
-					"type": "build",
-					"name": "default"
-				},
-				{
-					"type": "test",
-					"name": "default"
-				}
-			]
-		},
-		{
-			"name": "windows-msvc-debug",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "MSVC debug workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-debug"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-debug"
-				}
-			]
-		},
-		{
-			"name": "windows-msvc-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "MSVC release with debug info workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-windows-2022",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "CI workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-release"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-release"
-				}
-			]
-		},
-		{
-			"name": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "GNU debug workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-debug"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-debug"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-debug"
-				}
-			]
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "GNU release with debug info workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-relwithdebinfo"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-ubuntu-22.04",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "CI workflow preset for Ubuntu",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-release"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-release"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-release"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Clang debug workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-debug"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-debug"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-debug"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Clang release with debug info workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-relwithdebinfo"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Clang release workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-release"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-release"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-release"
-				}
-			]
-		},
-		{
-			"name": "macos-debug",
-			"displayName": "[Debug] MacOS",
-			"description": "Release workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-debug"
-				},
-				{
-					"type": "test",
-					"name": "macos-debug"
-				}
-			]
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "Release with debug info workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "macos-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-macos-13",
-			"displayName": "[Release] MacOS",
-			"description": "CI workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-release"
-				},
-				{
-					"type": "test",
-					"name": "macos-release"
-				}
-			]
       }
     ]
   }

Dockerfile

@@ -31,7 +31,7 @@ COPY --from=build /app/build/*Server /app/
 
 # Necessary suplimentary files
 COPY --from=build /app/build/*.ini /app/configs/
-COPY --from=build /app/build/vanity/*.* /app/vanity/
+COPY --from=build /app/build/vanity/*.* /app/vanity/*
 COPY --from=build /app/build/navmeshes /app/navmeshes
 COPY --from=build /app/build/migrations /app/migrations
 COPY --from=build /app/build/*.dcf /app/
@@ -39,7 +39,7 @@ COPY --from=build /app/build/*.dcf /app/
 # backup of config and vanity files to copy to the host incase 
 # of a mount clobbering the copy from above
 COPY --from=build /app/build/*.ini /app/default-configs/ 
-COPY --from=build /app/build/vanity/*.* /app/default-vanity/
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/*
 
 # needed as the container runs with the root user
 # and therefore sudo doesn't exist

README.md

@@ -371,7 +371,7 @@ at once. For that:
 - Download the [.env.example](.env.example) file and place it next to `client` with the file name `.env`
   - You may get warnings that this name starts with a dot, acknowledge those, this is intentional. Depending on your operating system, you may need to activate showing hidden files (e.g. Ctrl-H in Gnome on Linux) and/or file extensions ("File name extensions" in the "View" tab on Windows).
   - Update the `ACCOUNT_MANAGER_SECRET` and `MARIADB_PASSWORD` with strong random passwords.
-    - Use a password generator <https://gchq.github.io/CyberChef/#recipe=Pseudo-Random_Number_Generator(256,'Hex')>
+    - Use a password generator like <https://keygen.io>
     - Avoid `:` and `@` characters
     - Once the database user is created, changing the password will not update it, so the server will just fail to connect.
   - Set `EXTERNAL_IP` to your LAN IP or public IP if you want to host the game for friends & family

build.sh

@@ -6,7 +6,8 @@ mkdir -p build
 cd build
 
 # Run cmake to generate make files
-cmake -DCMAKE_BUILD_TYPE="Release" ..
+cmake ..
 
 # To build utilizing multiple cores, append `-j` and the amount of cores to utilize, for example `cmake --build . --config Release -j8'
 cmake --build . --config Release $1
+

cmake/toolchains/linux-clang.cmake

@@ -1,14 +0,0 @@
-# Try and find a clang-16 install, falling back to a generic clang install otherwise
-find_program(CLANG_C_COMPILER clang-16 | clang REQUIRED)
-find_program(CLANG_CXX_COMPILER clang++-16 | clang++ REQUIRED)
-
-# Debug messages
-message(DEBUG "CLANG_C_COMPILER = ${CLANG_C_COMPILER}")
-message(DEBUG "CLANG_CXX_COMPILER = ${CLANG_CXX_COMPILER}")
-
-# Set compilers to clang (need to cache for VSCode tools to work correctly)
-set(CMAKE_C_COMPILER ${CLANG_C_COMPILER} CACHE STRING "Set C compiler")
-set(CMAKE_CXX_COMPILER ${CLANG_CXX_COMPILER} CACHE STRING "Set C++ compiler")
-
-# Set linker to lld
-add_link_options("-fuse-ld=lld")

cmake/toolchains/linux-gnu.cmake

@@ -1,11 +0,0 @@
-# Try and find a gcc/g++ install
-find_program(GNU_C_COMPILER cc | gcc REQUIRED)
-find_program(GNU_CXX_COMPILER c++ | g++ REQUIRED)
-
-# Debug messages
-message(DEBUG "GNU_C_COMPILER = ${GNU_C_COMPILER}")
-message(DEBUG "GNU_CXX_COMPILER = ${GNU_CXX_COMPILER}")
-
-# Set compilers to GNU (need to cache for VSCode tools to work correctly)
-set(CMAKE_C_COMPILER ${GNU_C_COMPILER} CACHE STRING "Set C compiler")
-set(CMAKE_CXX_COMPILER ${GNU_CXX_COMPILER} CACHE STRING "Set C++ compiler")

dAuthServer/AuthServer.cpp

@@ -21,8 +21,8 @@
 //Auth includes:
 #include "AuthPackets.h"
 #include "eConnectionType.h"
-#include "MessageType/Server.h"
-#include "MessageType/Auth.h"
+#include "eServerMessageType.h"
+#include "eAuthMessageType.h"
 
 #include "Game.h"
 #include "Server.h"
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
 
 	try {
 		Database::Connect();
-	} catch (std::exception& ex) {
+	} catch (sql::SQLException& ex) {
 		LOG("Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("AuthServer");
 		delete Game::server;
@@ -166,11 +166,11 @@ void HandlePacket(Packet* packet) {
 
 	if (packet->data[0] == ID_USER_PACKET_ENUM) {
 		if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::SERVER) {
-			if (static_cast<MessageType::Server>(packet->data[3]) == MessageType::Server::VERSION_CONFIRM) {
+			if (static_cast<eServerMessageType>(packet->data[3]) == eServerMessageType::VERSION_CONFIRM) {
 				AuthPackets::HandleHandshake(Game::server, packet);
 			}
 		} else if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::AUTH) {
-			if (static_cast<MessageType::Auth>(packet->data[3]) == MessageType::Auth::LOGIN_REQUEST) {
+			if (static_cast<eAuthMessageType>(packet->data[3]) == eAuthMessageType::LOGIN_REQUEST) {
 				AuthPackets::HandleLoginRequest(Game::server, packet);
 			}
 		}

dChatServer/ChatIgnoreList.cpp

@@ -1,6 +1,6 @@
 #include "ChatIgnoreList.h"
 #include "PlayerContainer.h"
-#include "MessageType/Chat.h"
+#include "eChatMessageType.h"
 #include "BitStreamUtils.h"
 #include "Game.h"
 #include "Logger.h"
@@ -13,7 +13,7 @@
 // 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,  MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT,  eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receivingPlayer);
 
 	//portion that will get routed:

dChatServer/ChatPacketHandler.cpp

@@ -13,9 +13,9 @@
 #include "dConfig.h"
 #include "eObjectBits.h"
 #include "eConnectionType.h"
-#include "MessageType/Chat.h"
-#include "MessageType/Client.h"
-#include "MessageType/Game.h"
+#include "eChatMessageType.h"
+#include "eClientMessageType.h"
+#include "eGameMessageType.h"
 #include "StringifiedEnum.h"
 #include "eGameMasterLevel.h"
 #include "ChatPackets.h"
@@ -60,11 +60,11 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 
 	//Now, we need to send the friendlist to the server they came from:
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::GET_FRIENDS_LIST_RESPONSE);
+	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());
@@ -368,10 +368,10 @@ void ChatPacketHandler::HandleWho(Packet* packet) {
 	bool online = player;
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(request.requestor);
 
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::WHO_RESPONSE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::WHO_RESPONSE);
 	bitStream.Write<uint8_t>(online);
 	bitStream.Write(player.zoneID.GetMapID());
 	bitStream.Write(player.zoneID.GetInstanceID());
@@ -391,10 +391,10 @@ void ChatPacketHandler::HandleShowAll(Packet* packet) {
 	if (!sender) return;
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(request.requestor);
 
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::SHOW_ALL_RESPONSE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::SHOW_ALL_RESPONSE);
 	bitStream.Write<uint8_t>(!request.displayZoneData && !request.displayIndividualPlayers);
 	bitStream.Write(Game::playerContainer.GetPlayerCount());
 	bitStream.Write(Game::playerContainer.GetSimCount());
@@ -515,10 +515,10 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 
 void ChatPacketHandler::SendPrivateChatMessage(const PlayerData& sender, const PlayerData& receiver, const PlayerData& routeTo, const LUWString& message, const eChatChannel channel, const eChatMessageResponseCode responseCode) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(routeTo.playerID);
 
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::PRIVATE_CHAT_MESSAGE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::PRIVATE_CHAT_MESSAGE);
 	bitStream.Write(sender.playerID);
 	bitStream.Write(channel);
 	bitStream.Write<uint32_t>(0); // not used
@@ -757,11 +757,11 @@ void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
 
 void ChatPacketHandler::SendTeamInvite(const PlayerData& receiver, const PlayerData& sender) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::TEAM_INVITE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TEAM_INVITE);
 
 	bitStream.Write(LUWString(sender.playerName.c_str()));
 	bitStream.Write(sender.playerID);
@@ -772,14 +772,14 @@ void ChatPacketHandler::SendTeamInvite(const PlayerData& receiver, const PlayerD
 
 void ChatPacketHandler::SendTeamInviteConfirm(const PlayerData& receiver, bool bLeaderIsFreeTrial, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, uint8_t ucResponseCode, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_INVITE_CONFIRM);
+	bitStream.Write(eGameMessageType::TEAM_INVITE_CONFIRM);
 
 	bitStream.Write(bLeaderIsFreeTrial);
 	bitStream.Write(i64LeaderID);
@@ -799,14 +799,14 @@ void ChatPacketHandler::SendTeamInviteConfirm(const PlayerData& receiver, bool b
 
 void ChatPacketHandler::SendTeamStatus(const PlayerData& receiver, LWOOBJID i64LeaderID, LWOZONEID i64LeaderZoneID, uint8_t ucLootFlag, uint8_t ucNumOfOtherPlayers, std::u16string wsLeaderName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_GET_STATUS_RESPONSE);
+	bitStream.Write(eGameMessageType::TEAM_GET_STATUS_RESPONSE);
 
 	bitStream.Write(i64LeaderID);
 	bitStream.Write(i64LeaderZoneID);
@@ -824,14 +824,14 @@ void ChatPacketHandler::SendTeamStatus(const PlayerData& receiver, LWOOBJID i64L
 
 void ChatPacketHandler::SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i64PlayerID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_SET_LEADER);
+	bitStream.Write(eGameMessageType::TEAM_SET_LEADER);
 
 	bitStream.Write(i64PlayerID);
 
@@ -841,14 +841,14 @@ void ChatPacketHandler::SendTeamSetLeader(const PlayerData& receiver, LWOOBJID i
 
 void ChatPacketHandler::SendTeamAddPlayer(const PlayerData& receiver, bool bIsFreeTrial, bool bLocal, bool bNoLootOnDeath, LWOOBJID i64PlayerID, std::u16string wsPlayerName, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_ADD_PLAYER);
+	bitStream.Write(eGameMessageType::TEAM_ADD_PLAYER);
 
 	bitStream.Write(bIsFreeTrial);
 	bitStream.Write(bLocal);
@@ -870,14 +870,14 @@ void ChatPacketHandler::SendTeamAddPlayer(const PlayerData& receiver, bool bIsFr
 
 void ChatPacketHandler::SendTeamRemovePlayer(const PlayerData& receiver, bool bDisband, bool bIsKicked, bool bIsLeaving, bool bLocal, LWOOBJID i64LeaderID, LWOOBJID i64PlayerID, std::u16string wsPlayerName) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_REMOVE_PLAYER);
+	bitStream.Write(eGameMessageType::TEAM_REMOVE_PLAYER);
 
 	bitStream.Write(bDisband);
 	bitStream.Write(bIsKicked);
@@ -896,14 +896,14 @@ void ChatPacketHandler::SendTeamRemovePlayer(const PlayerData& receiver, bool bD
 
 void ChatPacketHandler::SendTeamSetOffWorldFlag(const PlayerData& receiver, LWOOBJID i64PlayerID, LWOZONEID zoneID) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
 	CMSGHEADER;
 
 	bitStream.Write(receiver.playerID);
-	bitStream.Write(MessageType::Game::TEAM_SET_OFF_WORLD_FLAG);
+	bitStream.Write(eGameMessageType::TEAM_SET_OFF_WORLD_FLAG);
 
 	bitStream.Write(i64PlayerID);
 	if (receiver.zoneID.GetCloneID() == zoneID.GetCloneID()) {
@@ -930,11 +930,11 @@ void ChatPacketHandler::SendFriendUpdate(const PlayerData& friendData, const Pla
 		[bool] - is FTP*/
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(friendData.playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::UPDATE_FRIEND_NOTIFY);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::UPDATE_FRIEND_NOTIFY);
 	bitStream.Write<uint8_t>(notifyType);
 
 	std::string playerName = playerData.playerName.c_str();
@@ -967,11 +967,11 @@ void ChatPacketHandler::SendFriendRequest(const PlayerData& receiver, const Play
 	}
 
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::ADD_FRIEND_REQUEST);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_REQUEST);
 	bitStream.Write(LUWString(sender.playerName));
 	bitStream.Write<uint8_t>(0); // This is a BFF flag however this is unused in live and does not have an implementation client side.
 
@@ -981,11 +981,11 @@ void ChatPacketHandler::SendFriendRequest(const PlayerData& receiver, const Play
 
 void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const PlayerData& sender, eAddFriendResponseType responseCode, uint8_t isBestFriendsAlready, uint8_t isBestFriendRequest) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	// Portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::ADD_FRIEND_RESPONSE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::ADD_FRIEND_RESPONSE);
 	bitStream.Write(responseCode);
 	// For all requests besides accepted, write a flag that says whether or not we are already best friends with the receiver.
 	bitStream.Write<uint8_t>(responseCode != eAddFriendResponseType::ACCEPTED ? isBestFriendsAlready : sender.sysAddr != UNASSIGNED_SYSTEM_ADDRESS);
@@ -1004,11 +1004,11 @@ void ChatPacketHandler::SendFriendResponse(const PlayerData& receiver, const Pla
 
 void ChatPacketHandler::SendRemoveFriend(const PlayerData& receiver, std::string& personToRemove, bool isSuccessful) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::WORLD_ROUTE_PACKET);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::WORLD_ROUTE_PACKET);
 	bitStream.Write(receiver.playerID);
 
 	//portion that will get routed:
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::REMOVE_FRIEND_RESPONSE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::REMOVE_FRIEND_RESPONSE);
 	bitStream.Write<uint8_t>(isSuccessful); //isOnline
 	bitStream.Write(LUWString(personToRemove));
 

dChatServer/ChatServer.cpp

@@ -16,8 +16,8 @@
 #include "eConnectionType.h"
 #include "PlayerContainer.h"
 #include "ChatPacketHandler.h"
-#include "MessageType/Chat.h"
-#include "MessageType/World.h"
+#include "eChatMessageType.h"
+#include "eWorldMessageType.h"
 #include "ChatIgnoreList.h"
 #include "StringifiedEnum.h"
 
@@ -81,7 +81,7 @@ int main(int argc, char** argv) {
 	//Connect to the MySQL Database
 	try {
 		Database::Connect();
-	} catch (std::exception& ex) {
+	} catch (sql::SQLException& ex) {
 		LOG("Got an error while connecting to the database: %s", ex.what());
 		Database::Destroy("ChatServer");
 		delete Game::server;
@@ -179,7 +179,6 @@ int main(int argc, char** argv) {
 }
 
 void HandlePacket(Packet* packet) {
-	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
 		LOG("A server has disconnected, erasing their connected players from the list.");
 	} else if (packet->data[0] == ID_NEW_INCOMING_CONNECTION) {
@@ -190,154 +189,154 @@ void HandlePacket(Packet* packet) {
 	inStream.SetReadOffset(BYTES_TO_BITS(1));
 
 	eConnectionType connection;
-	MessageType::Chat chatMessageID;
+	eChatMessageType chatMessageID;
 
 	inStream.Read(connection);
 	if (connection != eConnectionType::CHAT) return;
 	inStream.Read(chatMessageID);
 	
 	switch (chatMessageID) {
-		case MessageType::Chat::GM_MUTE:
+		case eChatMessageType::GM_MUTE:
 			Game::playerContainer.MuteUpdate(packet);
 			break;
 
-		case MessageType::Chat::CREATE_TEAM:
+		case eChatMessageType::CREATE_TEAM:
 			Game::playerContainer.CreateTeamServer(packet);
 			break;
 
-		case MessageType::Chat::GET_FRIENDS_LIST:
+		case eChatMessageType::GET_FRIENDS_LIST:
 			ChatPacketHandler::HandleFriendlistRequest(packet);
 			break;
 
-		case MessageType::Chat::GET_IGNORE_LIST:
+		case eChatMessageType::GET_IGNORE_LIST:
 			ChatIgnoreList::GetIgnoreList(packet);
 			break;
 
-		case MessageType::Chat::ADD_IGNORE:
+		case eChatMessageType::ADD_IGNORE:
 			ChatIgnoreList::AddIgnore(packet);
 			break;
 
-		case MessageType::Chat::REMOVE_IGNORE:
+		case eChatMessageType::REMOVE_IGNORE:
 			ChatIgnoreList::RemoveIgnore(packet);
 			break;
 
-		case MessageType::Chat::TEAM_GET_STATUS:
+		case eChatMessageType::TEAM_GET_STATUS:
 			ChatPacketHandler::HandleTeamStatusRequest(packet);
 			break;
 
-		case MessageType::Chat::ADD_FRIEND_REQUEST:
+		case eChatMessageType::ADD_FRIEND_REQUEST:
 			//this involves someone sending the initial request, the response is below, response as in from the other player.
 			//We basically just check to see if this player is online or not and route the packet.
 			ChatPacketHandler::HandleFriendRequest(packet);
 			break;
 
-		case MessageType::Chat::ADD_FRIEND_RESPONSE:
+		case eChatMessageType::ADD_FRIEND_RESPONSE:
 			//This isn't the response a server sent, rather it is a player's response to a received request.
 			//Here, we'll actually have to add them to eachother's friend lists depending on the response code.
 			ChatPacketHandler::HandleFriendResponse(packet);
 			break;
 
-		case MessageType::Chat::REMOVE_FRIEND:
+		case eChatMessageType::REMOVE_FRIEND:
 			ChatPacketHandler::HandleRemoveFriend(packet);
 			break;
 
-		case MessageType::Chat::GENERAL_CHAT_MESSAGE:
+		case eChatMessageType::GENERAL_CHAT_MESSAGE:
 			ChatPacketHandler::HandleChatMessage(packet);
 			break;
 
-		case MessageType::Chat::PRIVATE_CHAT_MESSAGE:
+		case eChatMessageType::PRIVATE_CHAT_MESSAGE:
 			//This message is supposed to be echo'd to both the sender and the receiver
 			//BUT: they have to have different responseCodes, so we'll do some of the ol hacky wacky to fix that right up.
 			ChatPacketHandler::HandlePrivateChatMessage(packet);
 			break;
 
-		case MessageType::Chat::TEAM_INVITE:
+		case eChatMessageType::TEAM_INVITE:
 			ChatPacketHandler::HandleTeamInvite(packet);
 			break;
 
-		case MessageType::Chat::TEAM_INVITE_RESPONSE:
+		case eChatMessageType::TEAM_INVITE_RESPONSE:
 			ChatPacketHandler::HandleTeamInviteResponse(packet);
 			break;
 
-		case MessageType::Chat::TEAM_LEAVE:
+		case eChatMessageType::TEAM_LEAVE:
 			ChatPacketHandler::HandleTeamLeave(packet);
 			break;
 
-		case MessageType::Chat::TEAM_SET_LEADER:
+		case eChatMessageType::TEAM_SET_LEADER:
 			ChatPacketHandler::HandleTeamPromote(packet);
 			break;
 
-		case MessageType::Chat::TEAM_KICK:
+		case eChatMessageType::TEAM_KICK:
 			ChatPacketHandler::HandleTeamKick(packet);
 			break;
 
-		case MessageType::Chat::TEAM_SET_LOOT:
+		case eChatMessageType::TEAM_SET_LOOT:
 			ChatPacketHandler::HandleTeamLootOption(packet);
 			break;
-		case MessageType::Chat::GMLEVEL_UPDATE:
+		case eChatMessageType::GMLEVEL_UPDATE:
 			ChatPacketHandler::HandleGMLevelUpdate(packet);
 			break;
-		case MessageType::Chat::LOGIN_SESSION_NOTIFY:
+		case eChatMessageType::LOGIN_SESSION_NOTIFY:
 			Game::playerContainer.InsertPlayer(packet);
 			break;
-		case MessageType::Chat::GM_ANNOUNCE:{
+		case eChatMessageType::GM_ANNOUNCE:{
 			// we just forward this packet to every connected server
 			inStream.ResetReadPointer();
 			Game::server->Send(inStream, packet->systemAddress, true); // send to everyone except origin
 			}
 			break;
-		case MessageType::Chat::UNEXPECTED_DISCONNECT:
+		case eChatMessageType::UNEXPECTED_DISCONNECT:
 			Game::playerContainer.RemovePlayer(packet);
 			break;
-		case MessageType::Chat::WHO:
+		case eChatMessageType::WHO:
 			ChatPacketHandler::HandleWho(packet);
 			break;
-		case MessageType::Chat::SHOW_ALL:
+		case eChatMessageType::SHOW_ALL:
 			ChatPacketHandler::HandleShowAll(packet);
 			break;
-		case MessageType::Chat::USER_CHANNEL_CHAT_MESSAGE:
-		case MessageType::Chat::WORLD_DISCONNECT_REQUEST:
-		case MessageType::Chat::WORLD_PROXIMITY_RESPONSE:
-		case MessageType::Chat::WORLD_PARCEL_RESPONSE:
-		case MessageType::Chat::TEAM_MISSED_INVITE_CHECK:
-		case MessageType::Chat::GUILD_CREATE:
-		case MessageType::Chat::GUILD_INVITE:
-		case MessageType::Chat::GUILD_INVITE_RESPONSE:
-		case MessageType::Chat::GUILD_LEAVE:
-		case MessageType::Chat::GUILD_KICK:
-		case MessageType::Chat::GUILD_GET_STATUS:
-		case MessageType::Chat::GUILD_GET_ALL:
-		case MessageType::Chat::BLUEPRINT_MODERATED:
-		case MessageType::Chat::BLUEPRINT_MODEL_READY:
-		case MessageType::Chat::PROPERTY_READY_FOR_APPROVAL:
-		case MessageType::Chat::PROPERTY_MODERATION_CHANGED:
-		case MessageType::Chat::PROPERTY_BUILDMODE_CHANGED:
-		case MessageType::Chat::PROPERTY_BUILDMODE_CHANGED_REPORT:
-		case MessageType::Chat::MAIL:
-		case MessageType::Chat::WORLD_INSTANCE_LOCATION_REQUEST:
-		case MessageType::Chat::REPUTATION_UPDATE:
-		case MessageType::Chat::SEND_CANNED_TEXT:
-		case MessageType::Chat::CHARACTER_NAME_CHANGE_REQUEST:
-		case MessageType::Chat::CSR_REQUEST:
-		case MessageType::Chat::CSR_REPLY:
-		case MessageType::Chat::GM_KICK:
-		case MessageType::Chat::WORLD_ROUTE_PACKET:
-		case MessageType::Chat::GET_ZONE_POPULATIONS:
-		case MessageType::Chat::REQUEST_MINIMUM_CHAT_MODE:
-		case MessageType::Chat::MATCH_REQUEST:
-		case MessageType::Chat::UGCMANIFEST_REPORT_MISSING_FILE:
-		case MessageType::Chat::UGCMANIFEST_REPORT_DONE_FILE:
-		case MessageType::Chat::UGCMANIFEST_REPORT_DONE_BLUEPRINT:
-		case MessageType::Chat::UGCC_REQUEST:
-		case MessageType::Chat::WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE:
-		case MessageType::Chat::ACHIEVEMENT_NOTIFY:
-		case MessageType::Chat::GM_CLOSE_PRIVATE_CHAT_WINDOW:
-		case MessageType::Chat::PLAYER_READY:
-		case MessageType::Chat::GET_DONATION_TOTAL:
-		case MessageType::Chat::UPDATE_DONATION:
-		case MessageType::Chat::PRG_CSR_COMMAND:
-		case MessageType::Chat::HEARTBEAT_REQUEST_FROM_WORLD:
-		case MessageType::Chat::UPDATE_FREE_TRIAL_STATUS:
+		case eChatMessageType::USER_CHANNEL_CHAT_MESSAGE:
+		case eChatMessageType::WORLD_DISCONNECT_REQUEST:
+		case eChatMessageType::WORLD_PROXIMITY_RESPONSE:
+		case eChatMessageType::WORLD_PARCEL_RESPONSE:
+		case eChatMessageType::TEAM_MISSED_INVITE_CHECK:
+		case eChatMessageType::GUILD_CREATE:
+		case eChatMessageType::GUILD_INVITE:
+		case eChatMessageType::GUILD_INVITE_RESPONSE:
+		case eChatMessageType::GUILD_LEAVE:
+		case eChatMessageType::GUILD_KICK:
+		case eChatMessageType::GUILD_GET_STATUS:
+		case eChatMessageType::GUILD_GET_ALL:
+		case eChatMessageType::BLUEPRINT_MODERATED:
+		case eChatMessageType::BLUEPRINT_MODEL_READY:
+		case eChatMessageType::PROPERTY_READY_FOR_APPROVAL:
+		case eChatMessageType::PROPERTY_MODERATION_CHANGED:
+		case eChatMessageType::PROPERTY_BUILDMODE_CHANGED:
+		case eChatMessageType::PROPERTY_BUILDMODE_CHANGED_REPORT:
+		case eChatMessageType::MAIL:
+		case eChatMessageType::WORLD_INSTANCE_LOCATION_REQUEST:
+		case eChatMessageType::REPUTATION_UPDATE:
+		case eChatMessageType::SEND_CANNED_TEXT:
+		case eChatMessageType::CHARACTER_NAME_CHANGE_REQUEST:
+		case eChatMessageType::CSR_REQUEST:
+		case eChatMessageType::CSR_REPLY:
+		case eChatMessageType::GM_KICK:
+		case eChatMessageType::WORLD_ROUTE_PACKET:
+		case eChatMessageType::GET_ZONE_POPULATIONS:
+		case eChatMessageType::REQUEST_MINIMUM_CHAT_MODE:
+		case eChatMessageType::MATCH_REQUEST:
+		case eChatMessageType::UGCMANIFEST_REPORT_MISSING_FILE:
+		case eChatMessageType::UGCMANIFEST_REPORT_DONE_FILE:
+		case eChatMessageType::UGCMANIFEST_REPORT_DONE_BLUEPRINT:
+		case eChatMessageType::UGCC_REQUEST:
+		case eChatMessageType::WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE:
+		case eChatMessageType::ACHIEVEMENT_NOTIFY:
+		case eChatMessageType::GM_CLOSE_PRIVATE_CHAT_WINDOW:
+		case eChatMessageType::PLAYER_READY:
+		case eChatMessageType::GET_DONATION_TOTAL:
+		case eChatMessageType::UPDATE_DONATION:
+		case eChatMessageType::PRG_CSR_COMMAND:
+		case eChatMessageType::HEARTBEAT_REQUEST_FROM_WORLD:
+		case eChatMessageType::UPDATE_FREE_TRIAL_STATUS:
 			LOG("Unhandled CHAT Message id: %s (%i)", StringifiedEnum::ToString(chatMessageID).data(), chatMessageID);
 			break;
 		default:

dChatServer/PlayerContainer.cpp

@@ -11,7 +11,7 @@
 #include "eConnectionType.h"
 #include "ChatPackets.h"
 #include "dConfig.h"
-#include "MessageType/Chat.h"
+#include "eChatMessageType.h"
 
 void PlayerContainer::Initialize() {
 	m_MaxNumberOfBestFriends =
@@ -36,19 +36,16 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	data.playerID = playerId;
 
 	uint32_t len;
-	if (!inStream.Read<uint32_t>(len)) return;
+	inStream.Read<uint32_t>(len);
 
-	if (len > 33) {
-		LOG("Received a really long player name, probably a fake packet %i.", len);
-		return;
+	for (int i = 0; i < len; i++) {
+		char character; inStream.Read<char>(character);
+		data.playerName += character;
 	}
 
-	data.playerName.resize(len);
-	inStream.ReadAlignedBytes(reinterpret_cast<unsigned char*>(data.playerName.data()), len);
-
-	if (!inStream.Read(data.zoneID)) return;
-	if (!inStream.Read(data.muteExpire)) return;
-	if (!inStream.Read(data.gmLevel)) return;
+	inStream.Read(data.zoneID);
+	inStream.Read(data.muteExpire);
+	inStream.Read(data.gmLevel);
 	data.sysAddr = packet->systemAddress;
 
 	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
@@ -125,11 +122,6 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 	size_t membersSize = 0;
 	inStream.Read(membersSize);
 
-	if (membersSize >= 4) {
-		LOG("Tried to create a team with more than 4 players");
-		return;
-	}
-
 	std::vector<LWOOBJID> members;
 
 	members.reserve(membersSize);
@@ -148,13 +140,14 @@ void PlayerContainer::CreateTeamServer(Packet* packet) {
 
 	if (team != nullptr) {
 		team->zoneId = zoneId;
-		UpdateTeamsOnWorld(team, false);
 	}
+
+	UpdateTeamsOnWorld(team, false);
 }
 
 void PlayerContainer::BroadcastMuteUpdate(LWOOBJID player, time_t time) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::GM_MUTE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GM_MUTE);
 
 	bitStream.Write(player);
 	bitStream.Write(time);
@@ -361,7 +354,7 @@ void PlayerContainer::TeamStatusUpdate(TeamData* team) {
 
 void PlayerContainer::UpdateTeamsOnWorld(TeamData* team, bool deleteTeam) {
 	CBITSTREAM;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::TEAM_GET_STATUS);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::TEAM_GET_STATUS);
 
 	bitStream.Write(team->teamID);
 	bitStream.Write(deleteTeam);

dCommon/AMFDeserialize.cpp

@@ -9,54 +9,73 @@
  * AMF3 Deserializer written by EmosewaMC
  */
 
-std::unique_ptr<AMFBaseValue> AMFDeserialize::Read(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream& inStream) {
+	AMFBaseValue* returnValue = nullptr;
 	// Read in the value type from the bitStream
 	eAmf marker;
 	inStream.Read(marker);
 	// Based on the typing, create the value associated with that and return the base value class
 	switch (marker) {
-	case eAmf::Undefined:
-		return std::make_unique<AMFBaseValue>();
-	case eAmf::Null:
-		return std::make_unique<AMFNullValue>();
-	case eAmf::False:
-		return std::make_unique<AMFBoolValue>(false);
-	case eAmf::True:
-		return std::make_unique<AMFBoolValue>(true);
-	case eAmf::Integer:
-		return ReadAmfInteger(inStream);
-	case eAmf::Double:
-		return ReadAmfDouble(inStream);
-	case eAmf::String:
-		return ReadAmfString(inStream);
-	case eAmf::Array:
-		return ReadAmfArray(inStream);
+	case eAmf::Undefined: {
+		returnValue = new AMFBaseValue();
+		break;
+	}
+
+	case eAmf::Null: {
+		returnValue = new AMFNullValue();
+		break;
+	}
+
+	case eAmf::False: {
+		returnValue = new AMFBoolValue(false);
+		break;
+	}
+
+	case eAmf::True: {
+		returnValue = new AMFBoolValue(true);
+		break;
+	}
+
+	case eAmf::Integer: {
+		returnValue = ReadAmfInteger(inStream);
+		break;
+	}
+
+	case eAmf::Double: {
+		returnValue = ReadAmfDouble(inStream);
+		break;
+	}
+
+	case eAmf::String: {
+		returnValue = ReadAmfString(inStream);
+		break;
+	}
+
+	case eAmf::Array: {
+		returnValue = ReadAmfArray(inStream);
+		break;
+	}
 
 	// These values are unimplemented in the live client and will remain unimplemented
 	// unless someone modifies the client to allow serializing of these values.
 	case eAmf::XMLDoc:
-		[[fallthrough]];
 	case eAmf::Date:
-		[[fallthrough]];
 	case eAmf::Object:
-		[[fallthrough]];
 	case eAmf::XML:
-		[[fallthrough]];
 	case eAmf::ByteArray:
-		[[fallthrough]];
 	case eAmf::VectorInt:
-		[[fallthrough]];
 	case eAmf::VectorUInt:
-		[[fallthrough]];
 	case eAmf::VectorDouble:
-		[[fallthrough]];
 	case eAmf::VectorObject:
-		[[fallthrough]];
-	case eAmf::Dictionary:
+	case eAmf::Dictionary: {
 		throw marker;
+		break;
+	}
 	default:
 		throw std::invalid_argument("Invalid AMF3 marker" + std::to_string(static_cast<int32_t>(marker)));
+		break;
 	}
+	return returnValue;
 }
 
 uint32_t AMFDeserialize::ReadU29(RakNet::BitStream& inStream) {
@@ -99,14 +118,14 @@ const std::string AMFDeserialize::ReadString(RakNet::BitStream& inStream) {
 	}
 }
 
-std::unique_ptr<AMFDoubleValue> AMFDeserialize::ReadAmfDouble(RakNet::BitStream& inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream& inStream) {
 	double value;
 	inStream.Read<double>(value);
-	return std::make_unique<AMFDoubleValue>(value);
+	return new AMFDoubleValue(value);
 }
 
-std::unique_ptr<AMFArrayValue> AMFDeserialize::ReadAmfArray(RakNet::BitStream& inStream) {
-	auto arrayValue = std::make_unique<AMFArrayValue>();
+AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream& inStream) {
+	auto arrayValue = new AMFArrayValue();
 
 	// Read size of dense array
 	const auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
@@ -124,10 +143,10 @@ std::unique_ptr<AMFArrayValue> AMFDeserialize::ReadAmfArray(RakNet::BitStream& i
 	return arrayValue;
 }
 
-std::unique_ptr<AMFStringValue> AMFDeserialize::ReadAmfString(RakNet::BitStream& inStream) {
-	return std::make_unique<AMFStringValue>(ReadString(inStream));
+AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream& inStream) {
+	return new AMFStringValue(ReadString(inStream));
 }
 
-std::unique_ptr<AMFIntValue> AMFDeserialize::ReadAmfInteger(RakNet::BitStream& inStream) {
-	return std::make_unique<AMFIntValue>(ReadU29(inStream)); // NOTE: NARROWING CONVERSION FROM UINT TO INT. IS THIS INTENDED?
+AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream& inStream) {
+	return new AMFIntValue(ReadU29(inStream));
 }

dCommon/AMFDeserialize.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Amf3.h"
 #include "BitStream.h"
 
-#include <memory>
 #include <vector>
 #include <string>
 
+class AMFBaseValue;
+
 class AMFDeserialize {
 public:
 	/**
@@ -15,7 +15,7 @@ public:
 	 * @param inStream inStream to read value from.
 	 * @return Returns an AMFValue with all the information from the bitStream in it.
 	 */
-	std::unique_ptr<AMFBaseValue> Read(RakNet::BitStream& inStream);
+	AMFBaseValue* Read(RakNet::BitStream& inStream);
 private:
 	/**
 	 * @brief Private method to read a U29 integer from a bitstream
@@ -39,7 +39,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Double value represented as an AMFValue
 	 */
-	static std::unique_ptr<AMFDoubleValue> ReadAmfDouble(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfDouble(RakNet::BitStream& inStream);
 
 	/**
 	 * @brief Read an AMFArray from a bitStream
@@ -47,7 +47,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Array value represented as an AMFValue
 	 */
-	std::unique_ptr<AMFArrayValue> ReadAmfArray(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfArray(RakNet::BitStream& inStream);
 
 	/**
 	 * @brief Read an AMFString from a bitStream
@@ -55,7 +55,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return String value represented as an AMFValue
 	 */
-	std::unique_ptr<AMFStringValue> ReadAmfString(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfString(RakNet::BitStream& inStream);
 
 	/**
 	 * @brief Read an AMFInteger from a bitStream
@@ -63,7 +63,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Integer value represented as an AMFValue
 	 */
-	static std::unique_ptr<AMFIntValue> ReadAmfInteger(RakNet::BitStream& inStream);
+	AMFBaseValue* ReadAmfInteger(RakNet::BitStream& inStream);
 
 	/**
 	 * List of strings read so far saved to be read by reference.

dCommon/Amf3.h

@@ -105,14 +105,27 @@ using AMFDoubleValue = AMFValue<double>;
  * and are not to be deleted by a caller.
  */
 class AMFArrayValue : public AMFBaseValue {
-	using AMFAssociative =
-		std::unordered_map<std::string, std::unique_ptr<AMFBaseValue>, GeneralUtils::transparent_string_hash, std::equal_to<>>;
-
-	using AMFDense = std::vector<std::unique_ptr<AMFBaseValue>>;
+	using AMFAssociative = std::unordered_map<std::string, AMFBaseValue*>;
+	using AMFDense = std::vector<AMFBaseValue*>;
 
 public:
 	[[nodiscard]] constexpr eAmf GetValueType() const noexcept override { return eAmf::Array; }
 
+	~AMFArrayValue() override {
+		for (const auto* valueToDelete : GetDense()) {
+			if (valueToDelete) {
+				delete valueToDelete;
+				valueToDelete = nullptr;
+			}
+		}
+		for (auto valueToDelete : GetAssociative()) {
+			if (valueToDelete.second) {
+				delete valueToDelete.second;
+				valueToDelete.second = nullptr;
+			}
+		}
+	}
+
 	/**
 	 * Returns the Associative portion of the object
 	 */
@@ -138,32 +151,30 @@ public:
 	 * or nullptr if a key existed and was not the same type
 	 */
 	template <typename ValueType>
-	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const std::string_view key, const ValueType value) {
+	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, const ValueType value) {
 		const auto element = m_Associative.find(key);
 		AMFValue<ValueType>* val = nullptr;
 		bool found = true;
 		if (element == m_Associative.cend()) {
-			auto newVal = std::make_unique<AMFValue<ValueType>>(value);
-			val = newVal.get();
-			m_Associative.emplace(key, std::move(newVal));
+			val = new AMFValue<ValueType>(value);
+			m_Associative.emplace(key, val);
 		} else {
-			val = dynamic_cast<AMFValue<ValueType>*>(element->second.get());
+			val = dynamic_cast<AMFValue<ValueType>*>(element->second);
 			found = false;
 		}
 		return std::make_pair(val, found);
 	}
 
 	// Associates an array with a string key
-	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const std::string_view key) {
+	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
 		const auto element = m_Associative.find(key);
 		AMFArrayValue* val = nullptr;
 		bool found = true;
 		if (element == m_Associative.cend()) {
-			auto newVal = std::make_unique<AMFArrayValue>();
-			val = newVal.get();
-			m_Associative.emplace(key, std::move(newVal));
+			val = new AMFArrayValue();
+			m_Associative.emplace(key, val);
 		} else {
-			val = dynamic_cast<AMFArrayValue*>(element->second.get());
+			val = dynamic_cast<AMFArrayValue*>(element->second);
 			found = false;
 		}
 		return std::make_pair(val, found);
@@ -171,13 +182,15 @@ public:
 
 	// Associates an array with an integer key
 	[[maybe_unused]] std::pair<AMFBaseValue*, bool> Insert(const size_t index) {
+		AMFArrayValue* val = nullptr;
 		bool inserted = false;
 		if (index >= m_Dense.size()) {
 			m_Dense.resize(index + 1);
-			m_Dense.at(index) = std::make_unique<AMFArrayValue>();
+			val = new AMFArrayValue();
+			m_Dense.at(index) = val;
 			inserted = true;
 		}
-		return std::make_pair(dynamic_cast<AMFArrayValue*>(m_Dense.at(index).get()), inserted);
+		return std::make_pair(dynamic_cast<AMFArrayValue*>(m_Dense.at(index)), inserted);
 	}
 
 	/**
@@ -192,13 +205,15 @@ public:
 	 */
 	template <typename ValueType>
 	[[maybe_unused]] std::pair<AMFValue<ValueType>*, bool> Insert(const size_t index, const ValueType value) {
+		AMFValue<ValueType>* val = nullptr;
 		bool inserted = false;
 		if (index >= m_Dense.size()) {
 			m_Dense.resize(index + 1);
-			m_Dense.at(index) = std::make_unique<AMFValue<ValueType>>(value);
+			val = new AMFValue<ValueType>(value);
+			m_Dense.at(index) = val;
 			inserted = true;
 		}
-		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(m_Dense.at(index).get()), inserted);
+		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(m_Dense.at(index)), inserted);
 	}
 
 	/**
@@ -210,12 +225,13 @@ public:
 	 * @param key The key to associate with the value
 	 * @param value The value to insert
 	 */
-	void Insert(const std::string_view key, std::unique_ptr<AMFBaseValue> value) {
+	void Insert(const std::string& key, AMFBaseValue* const value) {
 		const auto element = m_Associative.find(key);
 		if (element != m_Associative.cend() && element->second) {
-			element->second = std::move(value);
+			delete element->second;
+			element->second = value;
 		} else {
-			m_Associative.emplace(key, std::move(value));
+			m_Associative.emplace(key, value);
 		}
 	}
 
@@ -228,11 +244,14 @@ public:
 	 * @param key The key to associate with the value
 	 * @param value The value to insert
 	 */
-	void Insert(const size_t index, std::unique_ptr<AMFBaseValue> value) {
-		if (index >= m_Dense.size()) {
+	void Insert(const size_t index, AMFBaseValue* const value) {
+		if (index < m_Dense.size()) {
+			const AMFDense::const_iterator itr = m_Dense.cbegin() + index;
+			if (*itr) delete m_Dense.at(index);
+		} else {
 			m_Dense.resize(index + 1);
 		}
-		m_Dense.at(index) = std::move(value);
+		m_Dense.at(index) = value;
 	}
 
 	/**
@@ -260,7 +279,8 @@ public:
 	void Remove(const std::string& key, const bool deleteValue = true) {
 		const AMFAssociative::const_iterator it = m_Associative.find(key);
 		if (it != m_Associative.cend()) {
-			if (deleteValue) m_Associative.erase(it);
+			if (deleteValue) delete it->second;
+			m_Associative.erase(it);
 		}
 	}
 
@@ -270,6 +290,7 @@ public:
 	void Remove(const size_t index) {
 		if (!m_Dense.empty() && index < m_Dense.size()) {
 			const auto itr = m_Dense.cbegin() + index;
+			if (*itr) delete (*itr);
 			m_Dense.erase(itr);
 		}
 	}
@@ -278,16 +299,16 @@ public:
 		if (!m_Dense.empty()) Remove(m_Dense.size() - 1);
 	}
 
-	[[nodiscard]] AMFArrayValue* GetArray(const std::string_view key) const {
+	[[nodiscard]] AMFArrayValue* GetArray(const std::string& key) const {
 		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		return it != m_Associative.cend() ? dynamic_cast<AMFArrayValue*>(it->second.get()) : nullptr;
+		return it != m_Associative.cend() ? dynamic_cast<AMFArrayValue*>(it->second) : nullptr;
 	}
 
 	[[nodiscard]] AMFArrayValue* GetArray(const size_t index) const {
-		return index < m_Dense.size() ? dynamic_cast<AMFArrayValue*>(m_Dense.at(index).get()) : nullptr;
+		return index < m_Dense.size() ? dynamic_cast<AMFArrayValue*>(m_Dense.at(index)) : nullptr;
 	}
 
-	[[maybe_unused]] inline AMFArrayValue* InsertArray(const std::string_view key) {
+	[[maybe_unused]] inline AMFArrayValue* InsertArray(const std::string& key) {
 		return static_cast<AMFArrayValue*>(Insert(key).first);
 	}
 
@@ -309,17 +330,17 @@ public:
 	 * @return The AMFValue
 	 */
 	template <typename AmfType>
-	[[nodiscard]] AMFValue<AmfType>* Get(const std::string_view key) const {
+	[[nodiscard]] AMFValue<AmfType>* Get(const std::string& key) const {
 		const AMFAssociative::const_iterator it = m_Associative.find(key);
 		return it != m_Associative.cend() ?
-			dynamic_cast<AMFValue<AmfType>*>(it->second.get()) :
+			dynamic_cast<AMFValue<AmfType>*>(it->second) :
 			nullptr;
 	}
 
 	// Get from the array but dont cast it
-	[[nodiscard]] AMFBaseValue* Get(const std::string_view key) const {
+	[[nodiscard]] AMFBaseValue* Get(const std::string& key) const {
 		const AMFAssociative::const_iterator it = m_Associative.find(key);
-		return it != m_Associative.cend() ? it->second.get() : nullptr;
+		return it != m_Associative.cend() ? it->second : nullptr;
 	}
 
 	/**
@@ -334,13 +355,13 @@ public:
 	template <typename AmfType>
 	[[nodiscard]] AMFValue<AmfType>* Get(const size_t index) const {
 		return index < m_Dense.size() ?
-			dynamic_cast<AMFValue<AmfType>*>(m_Dense.at(index).get()) :
+			dynamic_cast<AMFValue<AmfType>*>(m_Dense.at(index)) :
 			nullptr;
 	}
 
 	// Get from the dense but dont cast it
 	[[nodiscard]] AMFBaseValue* Get(const size_t index) const {
-		return index < m_Dense.size() ? m_Dense.at(index).get() : nullptr;
+		return index < m_Dense.size() ? m_Dense.at(index) : nullptr;
 	}
 
 private:

dCommon/BrickByBrickFix.cpp

@@ -123,7 +123,7 @@ uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
 				Database::Get()->UpdateUgcModelData(model.id, outputStringStream);
 				LOG("Updated model %i to sd0", model.id);
 				updatedModels++;
-			} catch (std::exception& exception) {
+			} 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());
 			}

dCommon/CMakeLists.txt

@@ -70,6 +70,5 @@ else ()
 endif ()
 
 target_link_libraries(dCommon
-	PUBLIC magic_enum::magic_enum
 	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
 	INTERFACE dDatabase)

dCommon/Diagnostics.cpp

@@ -201,7 +201,7 @@ void OnTerminate() {
 }
 
 void MakeBacktrace() {
-	struct sigaction sigact{};
+	struct sigaction sigact;
 
 	sigact.sa_sigaction = CritErrHdlr;
 	sigact.sa_flags = SA_RESTART | SA_SIGINFO;

dCommon/GeneralUtils.h

@@ -129,29 +129,6 @@ namespace GeneralUtils {
 
 	std::vector<std::string> GetSqlFileNamesFromFolder(const std::string_view folder);
 
-	/**
-	 * Transparent string hasher - used to allow string_view key lookups for maps storing std::string keys
-	 * https://www.reddit.com/r/cpp_questions/comments/12xw3sn/find_stdstring_view_in_unordered_map_with/jhki225/
-	 * https://godbolt.org/z/789xv8Eeq
-	*/
-	template <typename... Bases>
-	struct overload : Bases... {
-		using is_transparent = void;
-		using Bases::operator() ... ;
-	};
-
-	struct char_pointer_hash {
-		auto operator()(const char* const ptr) const noexcept {
-			return std::hash<std::string_view>{}(ptr);
-		}
-	};
-
-	using transparent_string_hash = overload<
-		std::hash<std::string>,
-		std::hash<std::string_view>,
-		char_pointer_hash
-	>;
-
 	// Concept constraining to enum types
 	template <typename T>
 	concept Enum = std::is_enum_v<T>;

dCommon/Implementation.h

@@ -1,92 +0,0 @@
-#ifndef __IMPLEMENTATION_H__
-#define __IMPLEMENTATION_H__
-
-#include <functional>
-#include <optional>
-
-/**
- * @brief A way to defer the implementation of an action.
- * 
- * @tparam R The result of the action.
- * @tparam T The types of the arguments that the implementation requires.
- */
-template <typename R, typename... T>
-class Implementation {
-public:
-	typedef std::function<std::optional<R>(T...)> ImplementationFunction;
-
-	/**
-	 * @brief Sets the implementation of the action.
-	 * 
-	 * @param implementation The implementation of the action.
-	 */
-	void SetImplementation(const ImplementationFunction& implementation) {
-		this->implementation = implementation;
-	}
-
-	/**
-	 * @brief Clears the implementation of the action.
-	 */
-	void ClearImplementation() {
-		implementation.reset();
-	}
-
-	/**
-	 * @brief Checks if the implementation is set.
-	 * 
-	 * @return true If the implementation is set.
-	 * @return false If the implementation is not set.
-	 */
-	bool IsSet() const {
-		return implementation.has_value();
-	}
-
-	/**
-	 * @brief Executes the implementation if it is set.
-	 * 
-	 * @param args The arguments to pass to the implementation.
-	 * @return std::optional<R> The optional result of the implementation. If the result is not set, it indicates that the default action should be taken.
-	 */
-	std::optional<R> Execute(T... args) const {
-		return IsSet() ? implementation.value()(args...) : std::nullopt;
-	}
-
-	/**
-	 * @brief Exectues the implementation if it is set, otherwise returns a default value.
-	 * 
-	 * @param args The arguments to pass to the implementation.
-	 * @param defaultValue The default value to return if the implementation is not set or should not be deferred.
-	 */
-	R ExecuteWithDefault(T... args, const R& defaultValue) const {
-		return Execute(args...).value_or(defaultValue);
-	}
-
-	/**
-	 * = operator overload.
-	 */
-	Implementation& operator=(const Implementation& other) {
-		implementation = other.implementation;
-		return *this;
-	}
-
-	/**
-	 * = operator overload.
-	 */
-	Implementation& operator=(const ImplementationFunction& implementation) {
-		this->implementation = implementation;
-		return *this;
-	}
-
-	/**
-	 * () operator overload.
-	 */
-	std::optional<R> operator()(T... args) {
-		return !IsSet() ? std::nullopt : implementation(args...);
-	}
-
-private:
-	std::optional<ImplementationFunction> implementation;
-
-};
-
-#endif  //!__IMPLEMENTATION_H__

dCommon/Observable.h

@@ -1,73 +0,0 @@
-#ifndef __OBSERVABLE_H__
-#define __OBSERVABLE_H__
-
-#include <vector>
-#include <functional>
-
-/**
- * @brief An event which can be observed by multiple observers.
- * 
- * @tparam T The types of the arguments to be passed to the observers.
- */
-template <typename... T>
-class Observable {
-public:
-	typedef std::function<void(T...)> Observer;
-
-	/**
-	 * @brief Adds an observer to the event.
-	 * 
-	 * @param observer The observer to add.
-	 */
-	void AddObserver(const Observer& observer) {
-		observers.push_back(observer);
-	}
-
-	/**
-	 * @brief Removes an observer from the event.
-	 * 
-	 * @param observer The observer to remove.
-	 */
-	void RemoveObserver(const Observer& observer) {
-		observers.erase(std::remove(observers.begin(), observers.end(), observer), observers.end());
-	}
-
-	/**
-	 * @brief Notifies all observers of the event.
-	 * 
-	 * @param args The arguments to pass to the observers.
-	 */
-	void Notify(T... args) {
-		for (const auto& observer : observers) {
-			observer(args...);
-		}
-	}
-
-	/**
-	 * += operator overload.
-	 */
-	Observable& operator+=(const Observer& observer) {
-		AddObserver(observer);
-		return *this;
-	}
-
-	/**
-	 * -= operator overload.
-	 */
-	Observable& operator-=(const Observer& observer) {
-		RemoveObserver(observer);
-		return *this;
-	}
-	
-	/**
-	 * () operator overload.
-	 */
-	void operator()(T... args) {
-		Notify(args...);
-	}
-
-private:
-	std::vector<Observer> observers;
-};
-
-#endif  //!__OBSERVABLE_H__

dCommon/dConfig.cpp

@@ -1,7 +1,6 @@
 #include "dConfig.h"
 
 #include <sstream>
-#include <algorithm>
 
 #include "BinaryPathFinder.h"
 #include "GeneralUtils.h"

dCommon/dEnums/MessageType/Auth.h

@@ -1,13 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace MessageType {
-	enum class Auth : uint32_t {
-		LOGIN_REQUEST = 0,
-		LOGOUT_REQUEST,
-		CREATE_NEW_ACCOUNT_REQUEST,
-		LEGOINTERFACE_AUTH_RESPONSE,
-		SESSIONKEY_RECEIVED_CONFIRM,
-		RUNTIME_CONFIG
-	};
-}

dCommon/dEnums/MessageType/Chat.h

@@ -1,78 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace MessageType {
-	//! The Internal Chat Packet Identifiers
-	enum class Chat : uint32_t {
-		LOGIN_SESSION_NOTIFY = 0,
-		GENERAL_CHAT_MESSAGE,
-		PRIVATE_CHAT_MESSAGE,
-		USER_CHANNEL_CHAT_MESSAGE,
-		WORLD_DISCONNECT_REQUEST,
-		WORLD_PROXIMITY_RESPONSE,
-		WORLD_PARCEL_RESPONSE,
-		ADD_FRIEND_REQUEST,
-		ADD_FRIEND_RESPONSE,
-		REMOVE_FRIEND,
-		GET_FRIENDS_LIST,
-		ADD_IGNORE,
-		REMOVE_IGNORE,
-		GET_IGNORE_LIST,
-		TEAM_MISSED_INVITE_CHECK,
-		TEAM_INVITE,
-		TEAM_INVITE_RESPONSE,
-		TEAM_KICK,
-		TEAM_LEAVE,
-		TEAM_SET_LOOT,
-		TEAM_SET_LEADER,
-		TEAM_GET_STATUS,
-		GUILD_CREATE,
-		GUILD_INVITE,
-		GUILD_INVITE_RESPONSE,
-		GUILD_LEAVE,
-		GUILD_KICK,
-		GUILD_GET_STATUS,
-		GUILD_GET_ALL,
-		SHOW_ALL,
-		BLUEPRINT_MODERATED,
-		BLUEPRINT_MODEL_READY,
-		PROPERTY_READY_FOR_APPROVAL,
-		PROPERTY_MODERATION_CHANGED,
-		PROPERTY_BUILDMODE_CHANGED,
-		PROPERTY_BUILDMODE_CHANGED_REPORT,
-		MAIL,
-		WORLD_INSTANCE_LOCATION_REQUEST,
-		REPUTATION_UPDATE,
-		SEND_CANNED_TEXT,
-		GMLEVEL_UPDATE,
-		CHARACTER_NAME_CHANGE_REQUEST,
-		CSR_REQUEST,
-		CSR_REPLY,
-		GM_KICK,
-		GM_ANNOUNCE,
-		GM_MUTE,
-		ACTIVITY_UPDATE,
-		WORLD_ROUTE_PACKET,
-		GET_ZONE_POPULATIONS,
-		REQUEST_MINIMUM_CHAT_MODE,
-		REQUEST_MINIMUM_CHAT_MODE_PRIVATE,
-		MATCH_REQUEST,
-		UGCMANIFEST_REPORT_MISSING_FILE,
-		UGCMANIFEST_REPORT_DONE_FILE,
-		UGCMANIFEST_REPORT_DONE_BLUEPRINT,
-		UGCC_REQUEST,
-		WHO,
-		WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE,
-		ACHIEVEMENT_NOTIFY,
-		GM_CLOSE_PRIVATE_CHAT_WINDOW,
-		UNEXPECTED_DISCONNECT,
-		PLAYER_READY,
-		GET_DONATION_TOTAL,
-		UPDATE_DONATION,
-		PRG_CSR_COMMAND,
-		HEARTBEAT_REQUEST_FROM_WORLD,
-		UPDATE_FREE_TRIAL_STATUS,
-		// CUSTOM DLU MESSAGE ID FOR INTERNAL USE
-		CREATE_TEAM,
-	};
-}

dCommon/dEnums/MessageType/Client.h

@@ -1,74 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace MessageType {
-	enum class Client : uint32_t {
-		LOGIN_RESPONSE = 0,
-		LOGOUT_RESPONSE,
-		LOAD_STATIC_ZONE,
-		CREATE_OBJECT,
-		CREATE_CHARACTER,
-		CREATE_CHARACTER_EXTENDED,
-		CHARACTER_LIST_RESPONSE,
-		CHARACTER_CREATE_RESPONSE,
-		CHARACTER_RENAME_RESPONSE,
-		CHAT_CONNECT_RESPONSE,
-		AUTH_ACCOUNT_CREATE_RESPONSE,
-		DELETE_CHARACTER_RESPONSE,
-		GAME_MSG,
-		CONNECT_CHAT,
-		TRANSFER_TO_WORLD,
-		IMPENDING_RELOAD_NOTIFY,
-		MAKE_GM_RESPONSE,
-		HTTP_MONITOR_INFO_RESPONSE,
-		SLASH_PUSH_MAP_RESPONSE,
-		SLASH_PULL_MAP_RESPONSE,
-		SLASH_LOCK_MAP_RESPONSE,
-		BLUEPRINT_SAVE_RESPONSE,
-		BLUEPRINT_LUP_SAVE_RESPONSE,
-		BLUEPRINT_LOAD_RESPONSE_ITEMID,
-		BLUEPRINT_GET_ALL_DATA_RESPONSE,
-		MODEL_INSTANTIATE_RESPONSE,
-		DEBUG_OUTPUT,
-		ADD_FRIEND_REQUEST,
-		ADD_FRIEND_RESPONSE,
-		REMOVE_FRIEND_RESPONSE,
-		GET_FRIENDS_LIST_RESPONSE,
-		UPDATE_FRIEND_NOTIFY,
-		ADD_IGNORE_RESPONSE,
-		REMOVE_IGNORE_RESPONSE,
-		GET_IGNORE_LIST_RESPONSE,
-		TEAM_INVITE,
-		TEAM_INVITE_INITIAL_RESPONSE,
-		GUILD_CREATE_RESPONSE,
-		GUILD_GET_STATUS_RESPONSE,
-		GUILD_INVITE,
-		GUILD_INVITE_INITIAL_RESPONSE,
-		GUILD_INVITE_FINAL_RESPONSE,
-		GUILD_INVITE_CONFIRM,
-		GUILD_ADD_PLAYER,
-		GUILD_REMOVE_PLAYER,
-		GUILD_LOGIN_LOGOUT,
-		GUILD_RANK_CHANGE,
-		GUILD_DATA,
-		GUILD_STATUS,
-		MAIL,
-		DB_PROXY_RESULT,
-		SHOW_ALL_RESPONSE,
-		WHO_RESPONSE,
-		SEND_CANNED_TEXT,
-		UPDATE_CHARACTER_NAME,
-		SET_NETWORK_SIMULATOR,
-		INVALID_CHAT_MESSAGE,
-		MINIMUM_CHAT_MODE_RESPONSE,
-		MINIMUM_CHAT_MODE_RESPONSE_PRIVATE,
-		CHAT_MODERATION_STRING,
-		UGC_MANIFEST_RESPONSE,
-		IN_LOGIN_QUEUE,
-		SERVER_STATES,
-		GM_CLOSE_TARGET_CHAT_WINDOW,
-		GENERAL_TEXT_FOR_LOCALIZATION,
-		UPDATE_FREE_TRIAL_STATUS,
-		UGC_DOWNLOAD_FAILED = 120
-	};
-}

dCommon/dEnums/MessageType/Master.h

@@ -1,34 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace MessageType {
-	enum class Master : uint32_t {
-		REQUEST_PERSISTENT_ID = 1,
-		REQUEST_PERSISTENT_ID_RESPONSE,
-		REQUEST_ZONE_TRANSFER,
-		REQUEST_ZONE_TRANSFER_RESPONSE,
-		SERVER_INFO,
-		REQUEST_SESSION_KEY,
-		SET_SESSION_KEY,
-		SESSION_KEY_RESPONSE,
-		PLAYER_ADDED,
-		PLAYER_REMOVED,
-
-		CREATE_PRIVATE_ZONE,
-		REQUEST_PRIVATE_ZONE,
-
-		WORLD_READY,
-		PREP_ZONE,
-
-		SHUTDOWN,
-		SHUTDOWN_RESPONSE,
-		SHUTDOWN_IMMEDIATE,
-
-		SHUTDOWN_UNIVERSE,
-
-		AFFIRM_TRANSFER_REQUEST,
-		AFFIRM_TRANSFER_RESPONSE,
-
-		NEW_SESSION_ALERT
-	};
-}

dCommon/dEnums/MessageType/Server.h

@@ -1,11 +0,0 @@
-#pragma once
-#include <cstdint>
-
-namespace MessageType {
-	//! The Internal Server Packet Identifiers
-	enum class Server : uint32_t {
-		VERSION_CONFIRM = 0,
-		DISCONNECT_NOTIFY,
-		GENERAL_NOTIFY
-	};
-}

dCommon/dEnums/MessageType/World.h

@@ -1,49 +0,0 @@
-#pragma once
-#include <cstdint>
-
-#include <magic_enum/magic_enum.hpp>
-
-namespace MessageType {
-	enum class World : uint32_t {
-		VALIDATION = 1,  // 				Session info
-		CHARACTER_LIST_REQUEST,
-		CHARACTER_CREATE_REQUEST,
-		LOGIN_REQUEST,  // 			Character selected
-		GAME_MSG,
-		CHARACTER_DELETE_REQUEST,
-		CHARACTER_RENAME_REQUEST,
-		HAPPY_FLOWER_MODE_NOTIFY,
-		SLASH_RELOAD_MAP,  // 			Reload map cmp
-		SLASH_PUSH_MAP_REQUEST,  // 	Push map req cmd
-		SLASH_PUSH_MAP,  // 			Push map cmd
-		SLASH_PULL_MAP,  // 			Pull map cmd
-		LOCK_MAP_REQUEST,
-		GENERAL_CHAT_MESSAGE,  // 		General chat message
-		HTTP_MONITOR_INFO_REQUEST,
-		SLASH_DEBUG_SCRIPTS,  // 		Debug scripts cmd
-		MODELS_CLEAR,
-		EXHIBIT_INSERT_MODEL,
-		LEVEL_LOAD_COMPLETE,  // 		Character data request
-		TMP_GUILD_CREATE,
-		ROUTE_PACKET,  // 				Social?
-		POSITION_UPDATE,
-		MAIL,
-		WORD_CHECK, // 				AllowList word check
-		STRING_CHECK,  // 				AllowList string check
-		GET_PLAYERS_IN_ZONE,
-		REQUEST_UGC_MANIFEST_INFO,
-		BLUEPRINT_GET_ALL_DATA_REQUEST,
-		CANCEL_MAP_QUEUE,
-		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<MessageType::World> {
-	static constexpr int min = 0;
-	static constexpr int max = 91;
-};

dCommon/dEnums/StringifiedEnum.h

@@ -2,7 +2,7 @@
 #define __STRINGIFIEDENUM_H__
 
 #include <string>
-#include <magic_enum/magic_enum.hpp>
+#include "magic_enum.hpp"
 
 namespace StringifiedEnum {
 	template<typename T>

dCommon/dEnums/dCommonVars.h

@@ -8,7 +8,7 @@
 #include <set>
 #include "BitStream.h"
 #include "eConnectionType.h"
-#include "MessageType/Client.h"
+#include "eClientMessageType.h"
 #include "BitStreamUtils.h"
 
 #pragma warning (disable:4251) //Disables SQL warnings
@@ -33,7 +33,7 @@ constexpr uint32_t lowFrameDelta = FRAMES_TO_MS(lowFramerate);
 #define CBITSTREAM RakNet::BitStream bitStream;
 #define CINSTREAM RakNet::BitStream inStream(packet->data, packet->length, false);
 #define CINSTREAM_SKIP_HEADER CINSTREAM if (inStream.GetNumberOfUnreadBits() >= BYTES_TO_BITS(HEADER_SIZE)) inStream.IgnoreBytes(HEADER_SIZE); else inStream.IgnoreBits(inStream.GetNumberOfUnreadBits());
-#define CMSGHEADER BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::GAME_MSG);
+#define CMSGHEADER BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 #define SEND_PACKET Game::server->Send(bitStream, sysAddr, false);
 #define SEND_PACKET_BROADCAST Game::server->Send(bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);
 

dCommon/dEnums/eAuthMessageType.h

@@ -0,0 +1,15 @@
+#ifndef __EAUTHMESSAGETYPE__H__
+#define __EAUTHMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eAuthMessageType : uint32_t {
+	LOGIN_REQUEST = 0,
+	LOGOUT_REQUEST,
+	CREATE_NEW_ACCOUNT_REQUEST,
+	LEGOINTERFACE_AUTH_RESPONSE,
+	SESSIONKEY_RECEIVED_CONFIRM,
+	RUNTIME_CONFIG
+};
+
+#endif  //!__EAUTHMESSAGETYPE__H__

dCommon/dEnums/eCharacterVersion.h

@@ -15,8 +15,7 @@ enum class eCharacterVersion : uint32_t {
 	// Fixes vault size value
 	VAULT_SIZE,
 	// Fixes speed base value in level component
-	SPEED_BASE,
-	UP_TO_DATE, // will become NJ_JAYMISSIONS
+	UP_TO_DATE, // will become SPEED_BASE
 };
 
 #endif  //!__ECHARACTERVERSION__H__

dCommon/dEnums/eChatMessageType.h

@@ -0,0 +1,80 @@
+#ifndef __ECHATMESSAGETYPE__H__
+#define __ECHATMESSAGETYPE__H__
+
+#include <cstdint>
+
+//! The Internal Chat Packet Identifiers
+enum class eChatMessageType :uint32_t {
+	LOGIN_SESSION_NOTIFY = 0,
+	GENERAL_CHAT_MESSAGE,
+	PRIVATE_CHAT_MESSAGE,
+	USER_CHANNEL_CHAT_MESSAGE,
+	WORLD_DISCONNECT_REQUEST,
+	WORLD_PROXIMITY_RESPONSE,
+	WORLD_PARCEL_RESPONSE,
+	ADD_FRIEND_REQUEST,
+	ADD_FRIEND_RESPONSE,
+	REMOVE_FRIEND,
+	GET_FRIENDS_LIST,
+	ADD_IGNORE,
+	REMOVE_IGNORE,
+	GET_IGNORE_LIST,
+	TEAM_MISSED_INVITE_CHECK,
+	TEAM_INVITE,
+	TEAM_INVITE_RESPONSE,
+	TEAM_KICK,
+	TEAM_LEAVE,
+	TEAM_SET_LOOT,
+	TEAM_SET_LEADER,
+	TEAM_GET_STATUS,
+	GUILD_CREATE,
+	GUILD_INVITE,
+	GUILD_INVITE_RESPONSE,
+	GUILD_LEAVE,
+	GUILD_KICK,
+	GUILD_GET_STATUS,
+	GUILD_GET_ALL,
+	SHOW_ALL,
+	BLUEPRINT_MODERATED,
+	BLUEPRINT_MODEL_READY,
+	PROPERTY_READY_FOR_APPROVAL,
+	PROPERTY_MODERATION_CHANGED,
+	PROPERTY_BUILDMODE_CHANGED,
+	PROPERTY_BUILDMODE_CHANGED_REPORT,
+	MAIL,
+	WORLD_INSTANCE_LOCATION_REQUEST,
+	REPUTATION_UPDATE,
+	SEND_CANNED_TEXT,
+	GMLEVEL_UPDATE,
+	CHARACTER_NAME_CHANGE_REQUEST,
+	CSR_REQUEST,
+	CSR_REPLY,
+	GM_KICK,
+	GM_ANNOUNCE,
+	GM_MUTE,
+	ACTIVITY_UPDATE,
+	WORLD_ROUTE_PACKET,
+	GET_ZONE_POPULATIONS,
+	REQUEST_MINIMUM_CHAT_MODE,
+	REQUEST_MINIMUM_CHAT_MODE_PRIVATE,
+	MATCH_REQUEST,
+	UGCMANIFEST_REPORT_MISSING_FILE,
+	UGCMANIFEST_REPORT_DONE_FILE,
+	UGCMANIFEST_REPORT_DONE_BLUEPRINT,
+	UGCC_REQUEST,
+	WHO,
+	WORLD_PLAYERS_PET_MODERATED_ACKNOWLEDGE,
+	ACHIEVEMENT_NOTIFY,
+	GM_CLOSE_PRIVATE_CHAT_WINDOW,
+	UNEXPECTED_DISCONNECT,
+	PLAYER_READY,
+	GET_DONATION_TOTAL,
+	UPDATE_DONATION,
+	PRG_CSR_COMMAND,
+	HEARTBEAT_REQUEST_FROM_WORLD,
+	UPDATE_FREE_TRIAL_STATUS,
+	// CUSTOM DLU MESSAGE ID FOR INTERNAL USE
+	CREATE_TEAM,
+};
+
+#endif  //!__ECHATMESSAGETYPE__H__

dCommon/dEnums/eClientMessageType.h

@@ -0,0 +1,76 @@
+#ifndef __ECLIENTMESSAGETYPE__H__
+#define __ECLIENTMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eClientMessageType : uint32_t {
+	LOGIN_RESPONSE = 0,
+	LOGOUT_RESPONSE,
+	LOAD_STATIC_ZONE,
+	CREATE_OBJECT,
+	CREATE_CHARACTER,
+	CREATE_CHARACTER_EXTENDED,
+	CHARACTER_LIST_RESPONSE,
+	CHARACTER_CREATE_RESPONSE,
+	CHARACTER_RENAME_RESPONSE,
+	CHAT_CONNECT_RESPONSE,
+	AUTH_ACCOUNT_CREATE_RESPONSE,
+	DELETE_CHARACTER_RESPONSE,
+	GAME_MSG,
+	CONNECT_CHAT,
+	TRANSFER_TO_WORLD,
+	IMPENDING_RELOAD_NOTIFY,
+	MAKE_GM_RESPONSE,
+	HTTP_MONITOR_INFO_RESPONSE,
+	SLASH_PUSH_MAP_RESPONSE,
+	SLASH_PULL_MAP_RESPONSE,
+	SLASH_LOCK_MAP_RESPONSE,
+	BLUEPRINT_SAVE_RESPONSE,
+	BLUEPRINT_LUP_SAVE_RESPONSE,
+	BLUEPRINT_LOAD_RESPONSE_ITEMID,
+	BLUEPRINT_GET_ALL_DATA_RESPONSE,
+	MODEL_INSTANTIATE_RESPONSE,
+	DEBUG_OUTPUT,
+	ADD_FRIEND_REQUEST,
+	ADD_FRIEND_RESPONSE,
+	REMOVE_FRIEND_RESPONSE,
+	GET_FRIENDS_LIST_RESPONSE,
+	UPDATE_FRIEND_NOTIFY,
+	ADD_IGNORE_RESPONSE,
+	REMOVE_IGNORE_RESPONSE,
+	GET_IGNORE_LIST_RESPONSE,
+	TEAM_INVITE,
+	TEAM_INVITE_INITIAL_RESPONSE,
+	GUILD_CREATE_RESPONSE,
+	GUILD_GET_STATUS_RESPONSE,
+	GUILD_INVITE,
+	GUILD_INVITE_INITIAL_RESPONSE,
+	GUILD_INVITE_FINAL_RESPONSE,
+	GUILD_INVITE_CONFIRM,
+	GUILD_ADD_PLAYER,
+	GUILD_REMOVE_PLAYER,
+	GUILD_LOGIN_LOGOUT,
+	GUILD_RANK_CHANGE,
+	GUILD_DATA,
+	GUILD_STATUS,
+	MAIL,
+	DB_PROXY_RESULT,
+	SHOW_ALL_RESPONSE,
+	WHO_RESPONSE,
+	SEND_CANNED_TEXT,
+	UPDATE_CHARACTER_NAME,
+	SET_NETWORK_SIMULATOR,
+	INVALID_CHAT_MESSAGE,
+	MINIMUM_CHAT_MODE_RESPONSE,
+	MINIMUM_CHAT_MODE_RESPONSE_PRIVATE,
+	CHAT_MODERATION_STRING,
+	UGC_MANIFEST_RESPONSE,
+	IN_LOGIN_QUEUE,
+	SERVER_STATES,
+	GM_CLOSE_TARGET_CHAT_WINDOW,
+	GENERAL_TEXT_FOR_LOCALIZATION,
+	UPDATE_FREE_TRIAL_STATUS,
+	UGC_DOWNLOAD_FAILED = 120
+};
+
+#endif  //!__ECLIENTMESSAGETYPE__H__

dCommon/dEnums/eInventoryType.h

@@ -4,9 +4,6 @@
 #define __EINVENTORYTYPE__H__
 
 #include <cstdint>
-
-#include <magic_enum/magic_enum.hpp>
-
 static const uint8_t NUMBER_OF_INVENTORIES = 17;
 /**
  * Represents the different types of inventories an entity may have
@@ -59,10 +56,4 @@ public:
 	};
 };
 
-template <>
-struct magic_enum::customize::enum_range<eInventoryType> {
-	static constexpr int min = 0;
-	static constexpr int max = 16;
-};
-
 #endif  //!__EINVENTORYTYPE__H__

dCommon/dEnums/eMasterMessageType.h

@@ -0,0 +1,36 @@
+#ifndef __EMASTERMESSAGETYPE__H__
+#define __EMASTERMESSAGETYPE__H__
+
+#include <cstdint>
+
+enum class eMasterMessageType : uint32_t {
+	REQUEST_PERSISTENT_ID = 1,
+	REQUEST_PERSISTENT_ID_RESPONSE,
+	REQUEST_ZONE_TRANSFER,
+	REQUEST_ZONE_TRANSFER_RESPONSE,
+	SERVER_INFO,
+	REQUEST_SESSION_KEY,
+	SET_SESSION_KEY,
+	SESSION_KEY_RESPONSE,
+	PLAYER_ADDED,
+	PLAYER_REMOVED,
+
+	CREATE_PRIVATE_ZONE,
+	REQUEST_PRIVATE_ZONE,
+
+	WORLD_READY,
+	PREP_ZONE,
+
+	SHUTDOWN,
+	SHUTDOWN_RESPONSE,
+	SHUTDOWN_IMMEDIATE,
+
+	SHUTDOWN_UNIVERSE,
+
+	AFFIRM_TRANSFER_REQUEST,
+	AFFIRM_TRANSFER_RESPONSE,
+
+	NEW_SESSION_ALERT
+};
+
+#endif  //!__EMASTERMESSAGETYPE__H__

dCommon/dEnums/ePropertySortType.h

@@ -1,11 +0,0 @@
-#ifndef EPROPERTYSORTTYPE_H
-#define EPROPERTYSORTTYPE_H
-
-enum ePropertySortType : int32_t {
-	SORT_TYPE_FRIENDS = 0,
-	SORT_TYPE_REPUTATION = 1,
-	SORT_TYPE_RECENT = 3,
-	SORT_TYPE_FEATURED = 5
-};
-
-#endif  //!EPROPERTYSORTTYPE_H

dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h

@@ -1,21 +0,0 @@
-#ifndef __EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__
-#define __EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__
-
-#include <cstdint>
-
-enum class eReponseMoveItemBetweenInventoryTypeCode : int32_t {
-	SUCCESS,
-	FAIL_GENERIC,
-	FAIL_INV_FULL,
-	FAIL_ITEM_NOT_FOUND,
-	FAIL_CANT_MOVE_TO_THAT_INV_TYPE,
-	FAIL_NOT_NEAR_BANK,
-	FAIL_CANT_SWAP_ITEMS,
-	FAIL_SOURCE_TYPE,
-	FAIL_WRONG_DEST_TYPE,
-	FAIL_SWAP_DEST_TYPE,
-	FAIL_CANT_MOVE_THINKING_HAT,
-	FAIL_DISMOUNT_BEFORE_MOVING
-};
-
-#endif  //!__EREPONSEMOVEITEMBETWEENINVENTORYTYPECODE__H__

dCommon/dEnums/eServerMessageType.h

@@ -0,0 +1,12 @@
+#ifndef __ESERVERMESSAGETYPE__H__
+#define __ESERVERMESSAGETYPE__H__
+
+#include <cstdint>
+//! The Internal Server Packet Identifiers
+enum class eServerMessageType : uint32_t {
+	VERSION_CONFIRM = 0,
+	DISCONNECT_NOTIFY,
+	GENERAL_NOTIFY
+};
+
+#endif  //!__ESERVERMESSAGETYPE__H__

dCommon/dEnums/eWorldMessageType.h

@@ -0,0 +1,51 @@
+#ifndef __EWORLDMESSAGETYPE__H__
+#define __EWORLDMESSAGETYPE__H__
+
+#include <cstdint>
+
+#include "magic_enum.hpp"
+
+enum class eWorldMessageType : uint32_t {
+	VALIDATION = 1,  // 				Session info
+	CHARACTER_LIST_REQUEST,
+	CHARACTER_CREATE_REQUEST,
+	LOGIN_REQUEST,  // 			Character selected
+	GAME_MSG,
+	CHARACTER_DELETE_REQUEST,
+	CHARACTER_RENAME_REQUEST,
+	HAPPY_FLOWER_MODE_NOTIFY,
+	SLASH_RELOAD_MAP,  // 			Reload map cmp
+	SLASH_PUSH_MAP_REQUEST,  // 	Push map req cmd
+	SLASH_PUSH_MAP,  // 			Push map cmd
+	SLASH_PULL_MAP,  // 			Pull map cmd
+	LOCK_MAP_REQUEST,
+	GENERAL_CHAT_MESSAGE,  // 		General chat message
+	HTTP_MONITOR_INFO_REQUEST,
+	SLASH_DEBUG_SCRIPTS,  // 		Debug scripts cmd
+	MODELS_CLEAR,
+	EXHIBIT_INSERT_MODEL,
+	LEVEL_LOAD_COMPLETE,  // 		Character data request
+	TMP_GUILD_CREATE,
+	ROUTE_PACKET,  // 				Social?
+	POSITION_UPDATE,
+	MAIL,
+	WORD_CHECK, // 				AllowList word check
+	STRING_CHECK,  // 				AllowList string check
+	GET_PLAYERS_IN_ZONE,
+	REQUEST_UGC_MANIFEST_INFO,
+	BLUEPRINT_GET_ALL_DATA_REQUEST,
+	CANCEL_MAP_QUEUE,
+	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;
+};
+
+#endif  //!__EWORLDMESSAGETYPE__H__

dDatabase/CMakeLists.txt

@@ -4,4 +4,4 @@ add_subdirectory(GameDatabase)
 add_library(dDatabase STATIC "MigrationRunner.cpp")
 target_include_directories(dDatabase PUBLIC ".")
 target_link_libraries(dDatabase
-	PUBLIC magic_enum::magic_enum dDatabaseCDClient dDatabaseGame)
+	PUBLIC dDatabaseCDClient dDatabaseGame)

dDatabase/GameDatabase/CMakeLists.txt

@@ -8,15 +8,9 @@ foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 endforeach()
 
-add_subdirectory(TestSQL)
-
-foreach(file ${DDATABSE_DATABSES_TEST_SQL_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "TestSQL/${file}")
-endforeach()
-
 add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
 target_include_directories(dDatabaseGame PUBLIC "."
-	"ITables" PRIVATE "MySQL" "TestSQL"
+	"ITables" PRIVATE "MySQL"
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 )

dDatabase/GameDatabase/Database.cpp

@@ -38,8 +38,3 @@ void Database::Destroy(std::string source) {
 		LOG("Trying to destroy database when it's not connected!");
 	}
 }
-
-void Database::_setDatabase(GameDatabase* const db) {
-	if (database) delete database;
-	database = db;
-}

dDatabase/GameDatabase/Database.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <conncpp.hpp>
 
 #include "GameDatabase.h"
 
@@ -8,8 +9,4 @@ namespace Database {
 	void Connect();
 	GameDatabase* Get();
 	void Destroy(std::string source = "");
-
-	// Used for assigning a test database as the handler for database logic.
-	// Do not use in production code.
-	void _setDatabase(GameDatabase* const db);
 };

dDatabase/GameDatabase/GameDatabase.h

@@ -23,8 +23,6 @@
 #include "IActivityLog.h"
 #include "IIgnoreList.h"
 #include "IAccountsRewardCodes.h"
-#include "IBehaviors.h"
-#include "IUgcModularBuild.h"
 
 namespace sql {
 	class Statement;
@@ -42,8 +40,7 @@ class GameDatabase :
 	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 IBehaviors, public IUgcModularBuild {
+	public IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList {
 public:
 	virtual ~GameDatabase() = default;
 	// TODO: These should be made private.

dDatabase/GameDatabase/ITables/IAccounts.h

@@ -33,9 +33,6 @@ public:
 
 	// Add a new account to the database.
 	virtual void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) = 0;
-
-	// Update the GameMaster level of an account.
-	virtual void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) = 0;
 };
 
 #endif  //!__IACCOUNTS__H__

dDatabase/GameDatabase/ITables/IBehaviors.h

@@ -1,22 +0,0 @@
-#ifndef IBEHAVIORS_H
-#define IBEHAVIORS_H
-
-#include <cstdint>
-
-#include "dCommonVars.h"
-
-class IBehaviors {
-public:
-	struct Info {
-		int32_t behaviorId{};
-		uint32_t characterId{};
-		std::string behaviorInfo;
-	};
-
-	// This Add also takes care of updating if it exists.
-	virtual void AddBehavior(const Info& info) = 0;
-	virtual std::string GetBehavior(const int32_t behaviorId) = 0;
-	virtual void RemoveBehavior(const int32_t behaviorId) = 0;
-};
-
-#endif  //!IBEHAVIORS_H

dDatabase/GameDatabase/ITables/ILeaderboard.h

@@ -3,45 +3,12 @@
 
 #include <cstdint>
 #include <optional>
-#include <string>
-#include <vector>
 
 class ILeaderboard {
 public:
 
-	struct Entry {
-		uint32_t charId{};
-		uint32_t lastPlayedTimestamp{};
-		float primaryScore{};
-		float secondaryScore{};
-		uint32_t tertiaryScore{};
-		uint32_t numWins{};
-		uint32_t numTimesPlayed{};
-		uint32_t ranking{};
-		std::string name{};
-	};
-
-	struct Score {
-		auto operator<=>(const Score& rhs) const = default;
-
-		float primaryScore{ 0.0f };
-		float secondaryScore{ 0.0f };
-		float tertiaryScore{ 0.0f };
-	};
-
 	// Get the donation total for the given activity id.
 	virtual std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) = 0;
-
-	virtual std::vector<ILeaderboard::Entry> GetDescendingLeaderboard(const uint32_t activityId) = 0;
-	virtual std::vector<ILeaderboard::Entry> GetAscendingLeaderboard(const uint32_t activityId) = 0;
-	virtual std::vector<ILeaderboard::Entry> GetNsLeaderboard(const uint32_t activityId) = 0;
-	virtual std::vector<ILeaderboard::Entry> GetAgsLeaderboard(const uint32_t activityId) = 0;
-	virtual std::optional<Score> GetPlayerScore(const uint32_t playerId, const uint32_t gameId) = 0;
-
-	virtual void SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) = 0;
-	virtual void UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) = 0;
-	virtual void IncrementNumWins(const uint32_t playerId, const uint32_t gameId) = 0;
-	virtual void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) = 0;
 };
 
 #endif  //!__ILEADERBOARD__H__

dDatabase/GameDatabase/ITables/IProperty.h

@@ -4,8 +4,6 @@
 #include <cstdint>
 #include <optional>
 
-enum ePropertySortType : int32_t;
-
 class IProperty {
 public:
 	struct Info {
@@ -20,33 +18,11 @@ public:
 		uint32_t lastUpdatedTime{};
 		uint32_t claimedTime{};
 		uint32_t reputation{};
-		float performanceCost{};
-	};
-
-	struct PropertyLookup {
-		uint32_t mapId{};
-		std::string searchString;
-		ePropertySortType sortChoice{};
-		uint32_t playerId{};
-		uint32_t numResults{};
-		uint32_t startIndex{};
-		uint32_t playerSort{};
-	};
-
-	struct PropertyEntranceResult {
-		int32_t totalEntriesMatchingQuery{};
-		// The entries that match the query. This should only contain up to 12 entries.
-		std::vector<IProperty::Info> entries;
 	};
 
 	// Get the property info for the given property id.
 	virtual std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) = 0;
 
-	// Get the properties for the given property lookup params.
-	// This is expected to return a result set of up to 12 properties
-	// so as not to transfer too much data at once.
-	virtual std::optional<IProperty::PropertyEntranceResult> GetProperties(const PropertyLookup& params) = 0;
-
 	// Update the property moderation info for the given property id.
 	virtual void UpdatePropertyModerationInfo(const IProperty::Info& info) = 0;
 	

dDatabase/GameDatabase/ITables/IPropertyContents.h

@@ -1,7 +1,6 @@
 #ifndef __IPROPERTIESCONTENTS__H__
 #define __IPROPERTIESCONTENTS__H__
 
-#include <array>
 #include <cstdint>
 #include <string_view>
 
@@ -17,7 +16,6 @@ public:
 		LWOOBJID id{};
 		LOT lot{};
 		uint32_t ugcId{};
-		std::array<int32_t, 5> behaviors{};
 	};
 
 	// Inserts a new UGC model into the database.
@@ -34,7 +32,7 @@ public:
 	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 UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) = 0;
+	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;

dDatabase/GameDatabase/ITables/IUgcModularBuild.h

@@ -1,14 +0,0 @@
-#ifndef IUGCMODULARBUILD_H
-#define IUGCMODULARBUILD_H
-
-#include <cstdint>
-#include <optional>
-#include <string>
-
-class IUgcModularBuild {
-public:
-	virtual void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) = 0;
-	virtual void DeleteUgcBuild(const LWOOBJID bigId) = 0;
-};
-
-#endif  //!IUGCMODULARBUILD_H

dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp

@@ -4,7 +4,6 @@
 #include "Game.h"
 #include "dConfig.h"
 #include "Logger.h"
-#include "dPlatforms.h"
 
 namespace {
 	std::string databaseName;
@@ -40,13 +39,14 @@ void MySQLDatabase::Connect() {
 	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 defined(DARKFLAME_PLATFORM_WIN32) && defined(_DEBUG)
-		con = driver->connect(properties["hostName"].c_str(), properties["user"].c_str(), properties["password"].c_str());
-#else
+	if (properties.find("localSocket") != properties.end() || properties.find("pipe") != properties.end()) {
 		con = driver->connect(properties);
-#endif
+	} else {
+		con = driver->connect(properties["hostName"].c_str(), properties["user"].c_str(), properties["password"].c_str());
+	}
 	con->setSchema(databaseName.c_str());
 }
 

dDatabase/GameDatabase/MySQL/MySQLDatabase.h

@@ -7,7 +7,6 @@
 #include "GameDatabase.h"
 
 typedef std::unique_ptr<sql::PreparedStatement>& UniquePreppedStmtRef;
-typedef std::unique_ptr<sql::ResultSet> UniqueResultSet;
 
 // 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.
@@ -75,7 +74,7 @@ public:
 	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 UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) 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;
@@ -109,22 +108,6 @@ public:
 	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;
-	void AddBehavior(const IBehaviors::Info& info) override;
-	std::string GetBehavior(const int32_t behaviorId) override;
-	void RemoveBehavior(const int32_t characterId) override;
-	void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) override;
-	std::optional<IProperty::PropertyEntranceResult> GetProperties(const IProperty::PropertyLookup& params) override;
-	std::vector<ILeaderboard::Entry> GetDescendingLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetAscendingLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetNsLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetAgsLeaderboard(const uint32_t activityId) override;
-	void SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override;
-	void UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override;
-	std::optional<ILeaderboard::Score> GetPlayerScore(const uint32_t playerId, const uint32_t gameId) override;
-	void IncrementNumWins(const uint32_t playerId, const uint32_t gameId) override;
-	void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) override;
-	void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) override;
-	void DeleteUgcBuild(const LWOOBJID bigId) override;
 private:
 
 	// Generic query functions that can be used for any query.

dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp

@@ -35,7 +35,3 @@ void MySQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::s
 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));
 }
-
-void MySQLDatabase::UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) {
-	ExecuteUpdate("UPDATE accounts SET gm_level = ? WHERE id = ?;", static_cast<int32_t>(gmLevel), accountId);
-}

dDatabase/GameDatabase/MySQL/Tables/Behaviors.cpp

@@ -1,19 +0,0 @@
-#include "IBehaviors.h"
-
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::AddBehavior(const IBehaviors::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO behaviors (behavior_info, character_id, behavior_id) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE behavior_info = ?",
-		info.behaviorInfo, info.characterId, info.behaviorId, info.behaviorInfo
-	);
-}
-
-void MySQLDatabase::RemoveBehavior(const int32_t behaviorId) {
-	ExecuteDelete("DELETE FROM behaviors WHERE behavior_id = ?", behaviorId);
-}
-
-std::string MySQLDatabase::GetBehavior(const int32_t behaviorId) {
-	auto result = ExecuteSelect("SELECT behavior_info FROM behaviors WHERE behavior_id = ?", behaviorId);
-	return result->next() ? result->getString("behavior_info").c_str() : "";
-}

dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt

@@ -2,7 +2,6 @@ set(DDATABASES_DATABASES_MYSQL_TABLES_SOURCES
 	"Accounts.cpp"
 	"AccountsRewardCodes.cpp"
 	"ActivityLog.cpp"
-	"Behaviors.cpp"
 	"BugReports.cpp"
 	"CharInfo.cpp"
 	"CharXml.cpp"
@@ -20,7 +19,6 @@ set(DDATABASES_DATABASES_MYSQL_TABLES_SOURCES
 	"PropertyContents.cpp"
 	"Servers.cpp"
 	"Ugc.cpp"
-	"UgcModularBuild.cpp"
 	PARENT_SCOPE
 )
 

dDatabase/GameDatabase/MySQL/Tables/Leaderboard.cpp

@@ -1,9 +1,5 @@
 #include "MySQLDatabase.h"
 
-#include "Game.h"
-#include "Logger.h"
-#include "dConfig.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);
 
@@ -13,79 +9,3 @@ std::optional<uint32_t> MySQLDatabase::GetDonationTotal(const uint32_t activityI
 
 	return donation_total->getUInt("donation_total");
 }
-
-std::vector<ILeaderboard::Entry> ProcessQuery(UniqueResultSet& rows) {
-	std::vector<ILeaderboard::Entry> entries;
-	entries.reserve(rows->rowsCount());
-
-	while (rows->next()) {
-		auto& entry = entries.emplace_back();
-
-		entry.charId = rows->getUInt("character_id");
-		entry.lastPlayedTimestamp = rows->getUInt("lp_unix");
-		entry.primaryScore = rows->getFloat("primaryScore");
-		entry.secondaryScore = rows->getFloat("secondaryScore");
-		entry.tertiaryScore = rows->getFloat("tertiaryScore");
-		entry.numWins = rows->getUInt("numWins");
-		entry.numTimesPlayed = rows->getUInt("timesPlayed");
-		entry.name = rows->getString("char_name");
-		// entry.ranking is never set because its calculated in leaderboard in code.
-	}
-
-	return entries;
-}
-
-std::vector<ILeaderboard::Entry> MySQLDatabase::GetDescendingLeaderboard(const uint32_t activityId) {
-	auto leaderboard = ExecuteSelect("SELECT *, UNIX_TIMESTAMP(last_played) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore DESC, tertiaryScore DESC, last_played ASC;", activityId);
-	return ProcessQuery(leaderboard);
-}
-
-std::vector<ILeaderboard::Entry> MySQLDatabase::GetAscendingLeaderboard(const uint32_t activityId) {
-	auto leaderboard = ExecuteSelect("SELECT *, UNIX_TIMESTAMP(last_played) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore ASC, secondaryscore ASC, tertiaryScore ASC, last_played ASC;", activityId);
-	return ProcessQuery(leaderboard);
-}
-
-std::vector<ILeaderboard::Entry> MySQLDatabase::GetAgsLeaderboard(const uint32_t activityId) {
-	auto query = Game::config->GetValue("classic_survival_scoring") != "1" ? 
-	"SELECT *, UNIX_TIMESTAMP(last_played) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore DESC, tertiaryScore DESC, last_played ASC;" : 
-	"SELECT *, UNIX_TIMESTAMP(last_played) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY secondaryscore DESC, primaryscore DESC, tertiaryScore DESC, last_played ASC;";
-	auto leaderboard = ExecuteSelect(query, activityId);
-	return ProcessQuery(leaderboard);
-}
-
-std::vector<ILeaderboard::Entry> MySQLDatabase::GetNsLeaderboard(const uint32_t activityId) {
-	auto leaderboard = ExecuteSelect("SELECT *, UNIX_TIMESTAMP(last_played) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore ASC, tertiaryScore DESC, last_played ASC;", activityId);
-	return ProcessQuery(leaderboard);
-}
-
-void MySQLDatabase::SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) {
-	ExecuteInsert("INSERT leaderboard SET primaryScore = ?, secondaryScore = ?, tertiaryScore = ?, character_id = ?, game_id = ?;",
-		score.primaryScore, score.secondaryScore, score.tertiaryScore, playerId, gameId);
-}
-
-void MySQLDatabase::UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) {
-	ExecuteInsert("UPDATE leaderboard SET primaryScore = ?, secondaryScore = ?, tertiaryScore = ?, timesPlayed = timesPlayed + 1 WHERE character_id = ? AND game_id = ?;",
-		score.primaryScore, score.secondaryScore, score.tertiaryScore, playerId, gameId);
-}
-
-void MySQLDatabase::IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) {
-	ExecuteUpdate("UPDATE leaderboard SET timesPlayed = timesPlayed + 1 WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-}
-
-std::optional<ILeaderboard::Score> MySQLDatabase::GetPlayerScore(const uint32_t playerId, const uint32_t gameId) {
-	std::optional<ILeaderboard::Score> toReturn = std::nullopt;
-	auto res = ExecuteSelect("SELECT * FROM leaderboard WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-	if (res->next()) {
-		toReturn = ILeaderboard::Score{
-			.primaryScore = res->getFloat("primaryScore"),
-			.secondaryScore = res->getFloat("secondaryScore"),
-			.tertiaryScore = res->getFloat("tertiaryScore")
-		};
-	}
-
-	return toReturn;
-}
-
-void MySQLDatabase::IncrementNumWins(const uint32_t playerId, const uint32_t gameId) {
-	ExecuteUpdate("UPDATE leaderboard SET numWins = numWins + 1 WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-}

dDatabase/GameDatabase/MySQL/Tables/Property.cpp

@@ -1,140 +1,8 @@
 #include "MySQLDatabase.h"
-#include "ePropertySortType.h"
-
-std::optional<IProperty::PropertyEntranceResult> MySQLDatabase::GetProperties(const IProperty::PropertyLookup& params) {
-	std::optional<IProperty::PropertyEntranceResult> result;
-	std::string query;
-	std::unique_ptr<sql::ResultSet> properties;
-
-	if (params.sortChoice == SORT_TYPE_FEATURED || params.sortChoice == SORT_TYPE_FRIENDS) {
-		query = R"QUERY(
-		FROM properties as p
-		JOIN charinfo as ci
-		ON ci.prop_clone_id = p.clone_id
-		where p.zone_id = ?
-		AND (
-			p.description LIKE ?
-		    OR p.name LIKE ?
-		    OR ci.name LIKE ?
-		)
-		AND p.privacy_option >= ?
-		AND p.owner_id IN (
-			SELECT fr.requested_player AS player FROM (
-				SELECT CASE 
-				WHEN player_id = ? THEN friend_id 
-				WHEN friend_id = ? THEN player_id 
-				END AS requested_player 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 != ?
-		) ORDER BY ci.name ASC
-		)QUERY";
-		const auto completeQuery = "SELECT p.* " + query + " LIMIT ? OFFSET ?;";
-		properties = ExecuteSelect(
-			completeQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.playerId,
-			params.playerId,
-			params.playerId,
-			params.numResults,
-			params.startIndex
-		);
-		const auto countQuery = "SELECT COUNT(*) as count" + query + ";";
-		auto count = ExecuteSelect(
-			countQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.playerId,
-			params.playerId,
-			params.playerId
-		);
-		if (count->next()) {
-			result->totalEntriesMatchingQuery = count->getUInt("count");
-		}
-	} else {
-		if (params.sortChoice == SORT_TYPE_REPUTATION) {
-			query = R"QUERY(
-			FROM properties as p
-			JOIN charinfo as ci
-			ON ci.prop_clone_id = p.clone_id
-			where p.zone_id = ?
-			AND (
-				p.description LIKE ?
-			    OR p.name LIKE ?
-			    OR ci.name LIKE ?
-			)
-			AND p.privacy_option >= ?
-			ORDER BY p.reputation DESC, p.last_updated DESC 
-			)QUERY";
-		} else {
-			query = R"QUERY(
-			FROM properties as p
-			JOIN charinfo as ci
-			ON ci.prop_clone_id = p.clone_id
-			where p.zone_id = ?
-			AND (
-				p.description LIKE ?
-			    OR p.name LIKE ?
-			    OR ci.name LIKE ?
-			)
-			AND p.privacy_option >= ?
-			ORDER BY p.last_updated DESC
-			)QUERY";
-		}
-		const auto completeQuery = "SELECT p.* " + query + " LIMIT ? OFFSET ?;";
-		properties = ExecuteSelect(
-			completeQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.numResults,
-			params.startIndex
-		);
-		const auto countQuery = "SELECT COUNT(*) as count" + query + ";";
-		auto count = ExecuteSelect(
-			countQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort
-		);
-		if (count->next()) {
-			result->totalEntriesMatchingQuery = count->getUInt("count");
-		}
-	}
-
-	while (properties->next()) {
-		auto& entry = result->entries.emplace_back();
-		entry.id = properties->getUInt64("id");
-		entry.ownerId = properties->getUInt64("owner_id");
-		entry.cloneId = properties->getUInt64("clone_id");
-		entry.name = properties->getString("name").c_str();
-		entry.description = properties->getString("description").c_str();
-		entry.privacyOption = properties->getInt("privacy_option");
-		entry.rejectionReason = properties->getString("rejection_reason").c_str();
-		entry.lastUpdatedTime = properties->getUInt("last_updated");
-		entry.claimedTime = properties->getUInt("time_claimed");
-		entry.reputation = properties->getUInt("reputation");
-		entry.modApproved = properties->getUInt("mod_approved");
-		entry.performanceCost = properties->getFloat("performance_cost");
-	}
-
-	return result;
-}
 
 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, performance_cost "
+		"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()) {
@@ -153,7 +21,6 @@ std::optional<IProperty::Info> MySQLDatabase::GetPropertyInfo(const LWOMAPID map
 	toReturn.claimedTime = propertyEntry->getUInt("time_claimed");
 	toReturn.reputation = propertyEntry->getUInt("reputation");
 	toReturn.modApproved = propertyEntry->getUInt("mod_approved");
-	toReturn.performanceCost = propertyEntry->getFloat("performance_cost");
 
 	return toReturn;
 }

dDatabase/GameDatabase/MySQL/Tables/PropertyContents.cpp

@@ -1,10 +1,7 @@
 #include "MySQLDatabase.h"
 
 std::vector<IPropertyContents::Model> MySQLDatabase::GetPropertyModels(const LWOOBJID& propertyId) {
-	auto result = ExecuteSelect(
-		"SELECT id, lot, x, y, z, rx, ry, rz, rw, ugc_id, "
-		"behavior_1, behavior_2, behavior_3, behavior_4, behavior_5 "
-		"FROM properties_contents WHERE property_id = ?;", propertyId);
+	auto result = ExecuteSelect("SELECT id, lot, x, y, z, rx, ry, rz, rw, ugc_id FROM properties_contents WHERE property_id = ?;", propertyId);
 
 	std::vector<IPropertyContents::Model> toReturn;
 	toReturn.reserve(result->rowsCount());
@@ -20,12 +17,6 @@ std::vector<IPropertyContents::Model> MySQLDatabase::GetPropertyModels(const LWO
 		model.rotation.y = result->getFloat("ry");
 		model.rotation.z = result->getFloat("rz");
 		model.ugcId = result->getUInt64("ugc_id");
-		model.behaviors[0] = result->getInt("behavior_1");
-		model.behaviors[1] = result->getInt("behavior_2");
-		model.behaviors[2] = result->getInt("behavior_3");
-		model.behaviors[3] = result->getInt("behavior_4");
-		model.behaviors[4] = result->getInt("behavior_5");
-
 		toReturn.push_back(std::move(model));
 	}
 	return toReturn;
@@ -41,23 +32,21 @@ void MySQLDatabase::InsertNewPropertyModel(const LWOOBJID& propertyId, const IPr
 			model.id, propertyId, model.ugcId == 0 ? std::nullopt : std::optional(model.ugcId), static_cast<uint32_t>(model.lot),
 			model.position.x, model.position.y, model.position.z, model.rotation.x, model.rotation.y, model.rotation.z, model.rotation.w,
 			name, "", // Model description.  TODO implement this.
-			model.behaviors[0], // behavior 1
-			model.behaviors[1], // behavior 2
-			model.behaviors[2], // behavior 3
-			model.behaviors[3], // behavior 4
-			model.behaviors[4] // behavior 5
+			0, // behavior 1.  TODO implement this.
+			0, // behavior 2.  TODO implement this.
+			0, // behavior 3.  TODO implement this.
+			0, // behavior 4.  TODO implement this.
+			0 // behavior 5.  TODO implement this.
 		);
 	} catch (sql::SQLException& e) {
 		LOG("Error inserting new property model: %s", e.what());
 	}
 }
 
-void MySQLDatabase::UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) {
+void MySQLDatabase::UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) {
 	ExecuteUpdate(
-		"UPDATE properties_contents SET x = ?, y = ?, z = ?, rx = ?, ry = ?, rz = ?, rw = ?, "
-		"behavior_1 = ?, behavior_2 = ?, behavior_3 = ?, behavior_4 = ?, behavior_5 = ? WHERE id = ?;",
-		position.x, position.y, position.z, rotation.x, rotation.y, rotation.z, rotation.w,
-		behaviors[0].first, behaviors[1].first, behaviors[2].first, behaviors[3].first, behaviors[4].first, propertyId);
+		"UPDATE properties_contents SET x = ?, y = ?, z = ?, rx = ?, ry = ?, rz = ?, rw = ? WHERE id = ?;",
+		position.x, position.y, position.z, rotation.x, rotation.y, rotation.z, rotation.w, propertyId);
 }
 
 void MySQLDatabase::RemoveModel(const LWOOBJID& modelId) {

dDatabase/GameDatabase/MySQL/Tables/UgcModularBuild.cpp

@@ -1,9 +0,0 @@
-#include "MySQLDatabase.h"
-
-void MySQLDatabase::InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) {
-	ExecuteInsert("INSERT INTO ugc_modular_build (ugc_id, ldf_config, character_id) VALUES (?,?,?)", bigId, modules, characterId);
-}
-
-void MySQLDatabase::DeleteUgcBuild(const LWOOBJID bigId) {
-	ExecuteDelete("DELETE FROM ugc_modular_build WHERE ugc_id = ?;", bigId);
-}

dDatabase/GameDatabase/TestSQL/CMakeLists.txt

@@ -1,4 +0,0 @@
-SET(DDATABSE_DATABSES_TEST_SQL_SOURCES
-	"TestSQLDatabase.cpp"
-	PARENT_SCOPE
-)

dDatabase/GameDatabase/TestSQL/TestSQLDatabase.cpp

@@ -1,306 +0,0 @@
-#include "TestSQLDatabase.h"
-
-void TestSQLDatabase::Connect() {
-
-}
-
-void TestSQLDatabase::Destroy(std::string source) {
-
-}
-
-sql::PreparedStatement* TestSQLDatabase::CreatePreppedStmt(const std::string& query) {
-	return nullptr;
-}
-
-void TestSQLDatabase::Commit() {
-
-}
-
-bool TestSQLDatabase::GetAutoCommit() {
-	return {};
-}
-
-void TestSQLDatabase::SetAutoCommit(bool value) {
-
-}
-
-void TestSQLDatabase::ExecuteCustomQuery(const std::string_view query) {
-
-}
-
-std::optional<IServers::MasterInfo> TestSQLDatabase::GetMasterInfo() {
-	return {};
-}
-
-std::vector<std::string> TestSQLDatabase::GetApprovedCharacterNames() {
-	return {};
-}
-
-std::vector<FriendData> TestSQLDatabase::GetFriendsList(uint32_t charID) {
-	return {};
-}
-
-std::optional<IFriends::BestFriendStatus> TestSQLDatabase::GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	return {};
-}
-
-void TestSQLDatabase::SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) {
-
-}
-
-void TestSQLDatabase::AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) {
-
-}
-
-void TestSQLDatabase::RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) {
-
-}
-
-void TestSQLDatabase::UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) {
-
-}
-
-void TestSQLDatabase::DeleteUgcModelData(const LWOOBJID& modelId) {
-
-}
-
-void TestSQLDatabase::UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) {
-
-}
-
-std::vector<IUgc::Model> TestSQLDatabase::GetAllUgcModels() {
-	return {};
-}
-
-void TestSQLDatabase::CreateMigrationHistoryTable() {
-
-}
-
-bool TestSQLDatabase::IsMigrationRun(const std::string_view str) {
-	return {};
-}
-
-void TestSQLDatabase::InsertMigration(const std::string_view str) {
-
-}
-
-std::optional<ICharInfo::Info> TestSQLDatabase::GetCharacterInfo(const uint32_t charId) {
-	return {};
-}
-
-std::optional<ICharInfo::Info> TestSQLDatabase::GetCharacterInfo(const std::string_view charId) {
-	return {};
-}
-
-std::string TestSQLDatabase::GetCharacterXml(const uint32_t accountId) {
-	return {};
-}
-
-void TestSQLDatabase::UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) {
-
-}
-
-std::optional<IAccounts::Info> TestSQLDatabase::GetAccountInfo(const std::string_view username) {
-	return {};
-}
-
-void TestSQLDatabase::InsertNewCharacter(const ICharInfo::Info info) {
-
-}
-
-void TestSQLDatabase::InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) {
-
-}
-
-std::vector<uint32_t> TestSQLDatabase::GetAccountCharacterIds(uint32_t accountId) {
-	return {};
-}
-
-void TestSQLDatabase::DeleteCharacter(const uint32_t characterId) {
-
-}
-
-void TestSQLDatabase::SetCharacterName(const uint32_t characterId, const std::string_view name) {
-
-}
-
-void TestSQLDatabase::SetPendingCharacterName(const uint32_t characterId, const std::string_view name) {
-
-}
-
-void TestSQLDatabase::UpdateLastLoggedInCharacter(const uint32_t characterId) {
-
-}
-
-void TestSQLDatabase::SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) {
-
-}
-
-std::optional<IPetNames::Info> TestSQLDatabase::GetPetNameInfo(const LWOOBJID& petId) {
-	return {};
-}
-
-std::optional<IProperty::Info> TestSQLDatabase::GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) {
-	return {};
-}
-
-void TestSQLDatabase::UpdatePropertyModerationInfo(const IProperty::Info& info) {
-
-}
-
-void TestSQLDatabase::UpdatePropertyDetails(const IProperty::Info& info) {
-
-}
-
-void TestSQLDatabase::InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) {
-
-}
-
-std::vector<IPropertyContents::Model> TestSQLDatabase::GetPropertyModels(const LWOOBJID& propertyId) {
-	return {};
-}
-
-void TestSQLDatabase::RemoveUnreferencedUgcModels() {
-
-}
-
-void TestSQLDatabase::InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) {
-
-}
-
-void TestSQLDatabase::UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) {
-
-}
-
-void TestSQLDatabase::RemoveModel(const LWOOBJID& modelId) {
-
-}
-
-void TestSQLDatabase::UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) {
-
-}
-
-void TestSQLDatabase::InsertNewBugReport(const IBugReports::Info& info) {
-
-}
-
-void TestSQLDatabase::InsertCheatDetection(const IPlayerCheatDetections::Info& info) {
-
-}
-
-void TestSQLDatabase::InsertNewMail(const IMail::MailInfo& mail) {
-
-}
-
-void TestSQLDatabase::InsertNewUgcModel(std::istringstream& sd0Data, const uint32_t blueprintId, const uint32_t accountId, const uint32_t characterId) {
-
-}
-
-std::vector<IMail::MailInfo> TestSQLDatabase::GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) {
-	return {};
-}
-
-std::optional<IMail::MailInfo> TestSQLDatabase::GetMail(const uint64_t mailId) {
-	return {};
-}
-
-uint32_t TestSQLDatabase::GetUnreadMailCount(const uint32_t characterId) {
-	return {};
-}
-
-void TestSQLDatabase::MarkMailRead(const uint64_t mailId) {
-
-}
-
-void TestSQLDatabase::DeleteMail(const uint64_t mailId) {
-
-}
-
-void TestSQLDatabase::ClaimMailItem(const uint64_t mailId) {
-
-}
-
-void TestSQLDatabase::InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) {
-
-}
-
-void TestSQLDatabase::UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) {
-
-}
-
-void TestSQLDatabase::UpdateAccountBan(const uint32_t accountId, const bool banned) {
-
-}
-
-void TestSQLDatabase::UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) {
-
-}
-
-void TestSQLDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
-
-}
-
-void TestSQLDatabase::SetMasterIp(const std::string_view ip, const uint32_t port) {
-
-}
-
-std::optional<uint32_t> TestSQLDatabase::GetCurrentPersistentId() {
-	return {};
-}
-
-void TestSQLDatabase::InsertDefaultPersistentId() {
-
-}
-
-void TestSQLDatabase::UpdatePersistentId(const uint32_t id) {
-
-}
-
-std::optional<uint32_t> TestSQLDatabase::GetDonationTotal(const uint32_t activityId) {
-	return {};
-}
-
-std::optional<bool> TestSQLDatabase::IsPlaykeyActive(const int32_t playkeyId) {
-	return {};
-}
-
-std::vector<IUgc::Model> TestSQLDatabase::GetUgcModels(const LWOOBJID& propertyId) {
-	return {};
-}
-
-void TestSQLDatabase::AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-
-}
-
-void TestSQLDatabase::RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-
-}
-
-std::vector<IIgnoreList::Info> TestSQLDatabase::GetIgnoreList(const uint32_t playerId) {
-	return {};
-}
-
-void TestSQLDatabase::InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) {
-
-}
-
-std::vector<uint32_t> TestSQLDatabase::GetRewardCodesByAccountID(const uint32_t account_id) {
-	return {};
-}
-
-void TestSQLDatabase::AddBehavior(const IBehaviors::Info& info) {
-
-}
-
-std::string TestSQLDatabase::GetBehavior(const int32_t behaviorId) {
-	return {};
-}
-
-void TestSQLDatabase::RemoveBehavior(const int32_t behaviorId) {
-
-}
-
-void TestSQLDatabase::UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) {
-
-}
-

dDatabase/GameDatabase/TestSQL/TestSQLDatabase.h

@@ -1,107 +0,0 @@
-#ifndef TESTSQLDATABASE_H
-#define TESTSQLDATABASE_H
-
-#include "GameDatabase.h"
-
-class TestSQLDatabase : public GameDatabase {
-	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 UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) 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;
-	void AddBehavior(const IBehaviors::Info& info) override;
-	std::string GetBehavior(const int32_t behaviorId) override;
-	void RemoveBehavior(const int32_t behaviorId) override;
-	void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) override;
-	std::optional<IProperty::PropertyEntranceResult> GetProperties(const IProperty::PropertyLookup& params) override { return {}; };
-	std::vector<ILeaderboard::Entry> GetDescendingLeaderboard(const uint32_t activityId) override { return {}; };
-	std::vector<ILeaderboard::Entry> GetAscendingLeaderboard(const uint32_t activityId) override { return {}; };
-	std::vector<ILeaderboard::Entry> GetNsLeaderboard(const uint32_t activityId) override { return {}; };
-	std::vector<ILeaderboard::Entry> GetAgsLeaderboard(const uint32_t activityId) override { return {}; };
-	void SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override {};
-	void UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override {};
-	std::optional<ILeaderboard::Score> GetPlayerScore(const uint32_t playerId, const uint32_t gameId) override { return {}; };
-	void IncrementNumWins(const uint32_t playerId, const uint32_t gameId) override {};
-	void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) override {};
-	void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) override {};
-	void DeleteUgcBuild(const LWOOBJID bigId) override {};
-};
-
-#endif  //!TESTSQLDATABASE_H

dDatabase/MigrationRunner.cpp

@@ -34,7 +34,7 @@ Migration LoadMigration(std::string path) {
 void MigrationRunner::RunMigrations() {
 	Database::Get()->CreateMigrationHistoryTable();
 
-	std::string finalSQL = "";
+	sql::SQLString finalSQL = "";
 	bool runSd0Migrations = false;
 	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/").string())) {
 		auto migration = LoadMigration("dlu/" + entry);
@@ -61,12 +61,12 @@ void MigrationRunner::RunMigrations() {
 	}
 
 	if (!finalSQL.empty()) {
-		auto migration = GeneralUtils::SplitString(finalSQL, ';');
+		auto migration = GeneralUtils::SplitString(static_cast<std::string>(finalSQL), ';');
 		for (auto& query : migration) {
 			try {
 				if (query.empty()) continue;
-				Database::Get()->ExecuteCustomQuery(query);
-			} catch (std::exception& e) {
+				Database::Get()->ExecuteCustomQuery(query.c_str());
+			} catch (sql::SQLException& e) {
 				LOG("Encountered error running migration: %s", e.what());
 			}
 		}

dECS/CMakeLists.txt

@@ -1,15 +0,0 @@
-set(gcc_like_cxx "$<COMPILE_LANG_AND_ID:CXX,ARMClang,AppleClang,Clang,GNU,LCC>")
-set(msvc_cxx "$<COMPILE_LANG_AND_ID:CXX,MSVC>")
-
-add_library(dECS STATIC
-    "Core.h"
-    "Iter.h"
-    "Core.cpp"
-    "System.cpp"
-)
-target_include_directories(dECS PUBLIC .)
-target_link_libraries(dECS PRIVATE dCommon magic_enum::magic_enum)
-target_compile_options(dECS PRIVATE
-  "$<${gcc_like_cxx}:$<BUILD_INTERFACE:-Wall;-Wextra>>"
-  "$<${msvc_cxx}:$<BUILD_INTERFACE:/W3>>"
-)

dECS/Core.cpp

@@ -1,70 +0,0 @@
-#include <atomic>
-#include <magic_enum/magic_enum_containers.hpp>
-#include <eReplicaComponentType.h>
-#include "Core.h"
-
-namespace dECS {
-    struct WorldData {
-        using CompSignature = magic_enum::containers::bitset<eReplicaComponentType>;
-        using CompMap = std::unordered_map<LWOOBJID, CompSignature>;
-        using CompStorage = std::unordered_map<eReplicaComponentType, std::unique_ptr<IStorage>>;
-
-        std::atomic<LWOOBJID> nextId = 1;
-        CompMap map;
-        CompStorage data;
-    };
-
-    World::World() : m_World{ std::make_shared<WorldData>() } {};
-
-    Entity World::MakeEntity() {
-        return Entity{ m_World->nextId.fetch_add(1, std::memory_order::relaxed),
-                       m_World };
-    }
-
-    void* Entity::AddComponent(const eReplicaComponentType kind, const StorageConstructor storageConstructor) {
-        if (auto w = m_World.lock()) {
-            // Add to kind signature
-            w->map[m_Id].set(kind, true);
-
-            // Get or add storage
-            auto storageIt = w->data.find(kind);
-            if (storageIt == w->data.cend()) {
-                bool inserted = false;
-                std::tie(storageIt, inserted) = w->data.try_emplace(kind, storageConstructor());
-                if (!inserted) throw "storage emplacement failure";
-            }
-            auto& storage = *storageIt->second;
-
-            // Return reference if already mapped, otherwise add component
-            auto compIt = storage.rowMap.find(m_Id);
-            if (compIt == storage.rowMap.cend()) {
-                const auto curSize = storage.rowMap.size();
-                storage.rowMap.emplace(m_Id, curSize);
-                return storage.emplace_back();
-            }
-            const auto row = compIt->second;
-            return storage.at(row);
-        }
-        return nullptr;
-    }
-
-    const void* Entity::GetComponent(const eReplicaComponentType kind) const {
-        if (auto const w = m_World.lock()) {
-            // Check that the entity has this component
-            if (!w->map[m_Id].test(kind)) return nullptr;
-
-            // Get the location where it's stored
-            const auto& storage = *w->data.at(kind);
-            const auto it = storage.rowMap.find(m_Id);
-            if (it == storage.rowMap.cend()) return nullptr;
-            const auto row = it->second;
-            return storage.at(row);
-        }
-        return nullptr;
-    }
-
-    void* Entity::GetComponent(const eReplicaComponentType kind) {
-        // Casting away const for this overload is safe, if not at all pretty
-        return const_cast<void*>(std::as_const(*this).GetComponent(kind));
-    }
-}

dECS/Core.h

@@ -1,180 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <memory>
-#include <string_view>
-#include <type_traits>
-#include <unordered_map>
-#include <vector>
-
-class Component;
-enum class eReplicaComponentType : uint32_t;
-using LWOOBJID = int64_t;
-
-namespace dECS {
-    // template <typename C>
-    // concept IsComponent = std::derived_from<C, Component>;
-
-    // Data structures
-    struct WorldData;
-    class World;
-
-    template <typename... Cs>
-    class System;
-
-    class Entity;
-    struct IStorage;
-
-    template <typename C>
-    class Storage;
-
-    using WorldPtr = std::shared_ptr<WorldData>;
-    using WeakWorldPtr = std::weak_ptr<WorldData>;
-
-    class World {
-    public:
-        World();
-
-        [[nodiscard]]
-        Entity MakeEntity();
-
-        template <typename... Cs>
-        [[nodiscard]]
-        System<Cs...> MakeSystem() {
-            return System<Cs...>{};
-        }
-
-        template <typename... Cs, typename S>
-        [[nodiscard]]
-        System<Cs...> MakeSystem(S&& name) {
-            return System<Cs...>{ std::forward<S>(name) };
-        }
-
-    private:
-        WorldPtr m_World;
-    };
-
-    template <typename... Cs>
-    class System {
-    public:
-        friend System World::MakeSystem<Cs...>();
-
-        template <typename... Ts, typename S>
-        friend System<Ts...> World::MakeSystem(S&&);
-
-        /*template <typename Fn>
-            requires std::is_invocable_r_v<void, Fn(Cs...), ObjId, Cs...>
-        void ForEach(Fn&& f) {
-            for (ObjId i = 0; i < mT.size(); ++i) {
-                auto& c = mT[i];
-                f(i, std::get<Cs>(c)...);
-            }
-        }*/
-
-        template <typename Fn>
-            requires std::is_invocable_r_v<void, Fn(Cs...), Cs...>
-        void ForEach(Fn&& fn) {
-            std::tuple<Cs...> comps; // some sort of iterator that returns a tuple each 'step?'
-            for (size_t i = 0; i < 5; ++i) {
-                fn(std::get<Cs>(comps)...);
-            }
-        }
-
-    private:
-        System() = default;
-
-        template <typename S>
-        explicit System(S&& name)
-            : m_name{ std::forward<S>(name) }
-        {}
-
-        std::string m_name;
-    };
-
-    class Entity {
-    public:
-        friend Entity World::MakeEntity();
-
-        using StorageConstructor = std::function<std::unique_ptr<IStorage>()>;
-
-        [[nodiscard]]
-        constexpr LWOOBJID GetObjectID() const noexcept {
-            return m_Id;
-        }
-
-        [[maybe_unused]]
-        void* AddComponent(eReplicaComponentType, StorageConstructor);
-
-        template <typename C>
-        [[maybe_unused]]
-        C* AddComponent() {
-            return static_cast<C*>(AddComponent(C::ComponentType, std::make_unique<Storage<C>>));
-        }
-
-        [[nodiscard]]
-        const void* GetComponent(eReplicaComponentType) const;
-
-        [[nodiscard]]
-        void* GetComponent(eReplicaComponentType);
-
-        template <typename C>
-        [[nodiscard]]
-        const C* GetComponent() const {
-            return static_cast<const C*>(GetComponent(C::ComponentType));
-        }
-
-        template <typename C>
-        [[nodiscard]]
-        C* GetComponent() {
-            return static_cast<C*>(GetComponent(C::ComponentType));
-        }
-
-    private:
-        Entity(const LWOOBJID id, const WeakWorldPtr world)
-            : m_Id{ id }
-            , m_World { world }
-            {}
-
-        LWOOBJID m_Id;
-
-        WeakWorldPtr m_World;
-    };
-
-    struct IStorage {
-        using RowMap = std::unordered_map<LWOOBJID, size_t>;
-
-        virtual ~IStorage() = default;
-
-        [[nodiscard]]
-        virtual void* at(size_t) = 0;
-
-        [[nodiscard]]
-        virtual const void* at(size_t) const = 0;
-
-        [[nodiscard]]
-        virtual void* emplace_back() = 0;
-
-        RowMap rowMap;
-    };
-
-    template <typename C>
-    class Storage : public IStorage {
-    public:
-        [[nodiscard]]
-        void* at(const size_t index) override {
-            return static_cast<void*>(&m_Vec.at(index));
-        }
-
-        [[nodiscard]]
-        const void* at(const size_t index) const override {
-            return static_cast<const void*>(&m_Vec.at(index));
-        }
-
-        [[nodiscard]]
-        void* emplace_back() override {
-            return static_cast<void*>(&m_Vec.emplace_back());
-        }
-
-    private:
-        std::vector<C> m_Vec;
-    };
-}

dECS/Iter.h

@@ -1,12 +0,0 @@
-#include "Core.h"
-
-namespace dECS {
-    class Iter {
-    public:
-        [[nodiscard]]
-        bool Next();
-
-    private:
-        WeakWorldPtr m_World;
-    };
-}

dECS/System.cpp

@@ -1,52 +0,0 @@
-#include "PetComponent.h"
-#include "MovementAIComponent.h"
-#include "MissionComponent.h"
-#include "eMissionState.h"
-
-using Pet = PetComponent;
-using Mission = MissionComponent;
-using MovementAI = MovementAIComponent;
-
-struct Position : NiPoint3 {};
-struct Treasure {};
-
-namespace decs {
-    template <typename... Cs>
-    class System {
-    public:
-        template <typename Fn>
-        void each(Fn&& fn) {
-            fn();
-        }
-    };
-
-    class Scene {
-    public:
-        template <typename... Cs>
-        System<Cs...> system() {
-            return System<Cs...>{};
-        }
-    };
-}
-
-void run() {
-    auto scene = decs::Scene{};
-
-    scene.system<Pet>()
-        .each([](Pet& pet) {
-
-        });
-
-    scene.system<Pet, MovementAI>()
-        .each([](Pet& pet, MovementAI& move) {
-
-        });
-
-    scene.system<Pet, const Mission, const Position>()
-        .each([](Pet& pet, Mission const& mission, Position const& pos) {
-            auto const digUnlocked = mission.GetMissionState(842) == eMissionState::COMPLETE;
-            auto const treasurePos = PetDigServer::GetClosestTreasure(pos);
-
-
-        });
-}

dGame/Character.cpp

@@ -27,8 +27,6 @@ Character::Character(uint32_t id, User* parentUser) {
 	m_ID = id;
 	m_ParentUser = parentUser;
 	m_OurEntity = nullptr;
-	m_GMLevel = eGameMasterLevel::CIVILIAN;
-	m_PermissionMap = static_cast<ePermissionMap>(0);
 }
 
 Character::~Character() {
@@ -76,7 +74,7 @@ void Character::DoQuickXMLDataParse() {
 	if (m_Doc.Parse(m_XMLData.c_str(), m_XMLData.size()) == 0) {
 		LOG("Loaded xmlData for character %s (%i)!", m_Name.c_str(), m_ID);
 	} else {
-		LOG("Failed to load xmlData (%i) (%s) (%s)!", m_Doc.ErrorID(), m_Doc.ErrorIDToName(m_Doc.ErrorID()), m_Doc.ErrorStr());
+		LOG("Failed to load xmlData!");
 		//Server::rakServer->CloseConnection(m_ParentUser->GetSystemAddress(), true);
 		return;
 	}
@@ -241,7 +239,7 @@ void Character::SaveXMLToDatabase() {
 
 		auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 		// lzid garbage, binary concat of zoneID, zoneInstance and zoneClone
-		if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+		// if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
 			uint64_t lzidConcat = zoneInfo.GetCloneID();
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetInstanceID());
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetMapID());
@@ -253,7 +251,7 @@ void Character::SaveXMLToDatabase() {
 
 			// Set the target scene, custom attribute
 			character->SetAttribute("tscene", m_TargetScene.c_str());
-		}
+		// }
 
 		auto emotes = character->FirstChildElement("ue");
 		if (!emotes) emotes = m_Doc.NewElement("ue");

dGame/Character.h

@@ -38,7 +38,6 @@ public:
 
 	const std::string& GetXMLData() const { return m_XMLData; }
 	const tinyxml2::XMLDocument& GetXMLDoc() const { return m_Doc; }
-	void _setXmlDoc(tinyxml2::XMLDocument& doc) { doc.DeepCopy(&m_Doc); }
 
 	/**
 	 * Out of abundance of safety and clarity of what this saves, this is its own function.
@@ -460,31 +459,27 @@ public:
 
 	User* GetParentUser() const { return m_ParentUser; }
 
-	void _doQuickXMLDataParse() { DoQuickXMLDataParse(); }
-
-	void _setXmlData(const std::string& xmlData) { m_XMLData = xmlData; }
-
 private:
 	void UpdateInfoFromDatabase();
 	/**
 	 * The ID of this character. First 32 bits of the ObjectID.
 	 */
-	uint32_t m_ID{};
+	uint32_t m_ID;
 
 	/**
 	 * The 64-bit unique ID used in the game.
 	 */
-	LWOOBJID m_ObjectID{ LWOOBJID_EMPTY };
+	LWOOBJID m_ObjectID;
 
 	/**
 	 * The user that owns this character.
 	 */
-	User* m_ParentUser{};
+	User* m_ParentUser;
 
 	/**
 	 * If the character is in game, this is the entity that it represents, else nullptr.
 	 */
-	Entity* m_OurEntity{};
+	Entity* m_OurEntity;
 
 	/**
 	 * 0-9, the Game Master level of this character.
@@ -511,17 +506,17 @@ private:
 	/**
 	 * Whether the custom name of this character is rejected
 	 */
-	bool m_NameRejected{};
+	bool m_NameRejected;
 
 	/**
 	 * The current amount of coins of this character
 	 */
-	int64_t m_Coins{};
+	int64_t m_Coins;
 
 	/**
 	 * Whether the character is building
 	 */
-	bool m_BuildMode{};
+	bool m_BuildMode;
 
 	/**
 	 * The items equipped by the character on world load
@@ -588,7 +583,7 @@ private:
 	/**
 	 * The ID of the properties of this character
 	 */
-	uint32_t m_PropertyCloneID{};
+	uint32_t m_PropertyCloneID;
 
 	/**
 	 * The XML data for this character, stored as string
@@ -618,7 +613,7 @@ private:
 	/**
 	 * The last time this character logged in
 	 */
-	uint64_t m_LastLogin{};
+	uint64_t m_LastLogin;
 
 	/**
 	 * The gameplay flags this character has (not just true values)

dGame/Entity.cpp

@@ -24,7 +24,7 @@
 #include "eTriggerEventType.h"
 #include "eObjectBits.h"
 #include "PositionUpdate.h"
-#include "MessageType/Chat.h"
+#include "eChatMessageType.h"
 #include "PlayerManager.h"
 
 //Component includes:
@@ -83,7 +83,6 @@
 #include "ItemComponent.h"
 #include "GhostComponent.h"
 #include "AchievementVendorComponent.h"
-#include "VanityUtilities.h"
 
 // Table includes
 #include "CDComponentsRegistryTable.h"
@@ -97,10 +96,6 @@
 #include "CDSkillBehaviorTable.h"
 #include "CDZoneTableTable.h"
 
-#include <ranges>
-
-Observable<Entity*, const PositionUpdate&> Entity::OnPlayerPositionUpdate;
-
 Entity::Entity(const LWOOBJID& objectID, EntityInfo info, User* parentUser, Entity* parentEntity) {
 	m_ObjectID = objectID;
 	m_TemplateID = info.lot;
@@ -230,7 +225,7 @@ void Entity::Initialize() {
 
 		AddComponent<SimplePhysicsComponent>(simplePhysicsComponentID);
 
-		AddComponent<ModelComponent>()->LoadBehaviors();
+		AddComponent<ModelComponent>();
 
 		AddComponent<RenderComponent>();
 
@@ -288,9 +283,8 @@ void Entity::Initialize() {
 		AddComponent<PropertyEntranceComponent>(propertyEntranceComponentID);
 	}
 
-	const int32_t controllablePhysicsComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::CONTROLLABLE_PHYSICS);
-	if (controllablePhysicsComponentID > 0) {
-		auto* controllablePhysics = AddComponent<ControllablePhysicsComponent>(controllablePhysicsComponentID);
+	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::CONTROLLABLE_PHYSICS) > 0) {
+		auto* controllablePhysics = AddComponent<ControllablePhysicsComponent>();
 
 		if (m_Character) {
 			controllablePhysics->LoadFromXml(m_Character->GetXMLDoc());
@@ -333,19 +327,16 @@ void Entity::Initialize() {
 		AddComponent<SimplePhysicsComponent>(simplePhysicsComponentID);
 	}
 
-	const int32_t rigidBodyPhantomPhysicsComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RIGID_BODY_PHANTOM_PHYSICS);
-	if (rigidBodyPhantomPhysicsComponentID > 0) {
-		AddComponent<RigidbodyPhantomPhysicsComponent>(rigidBodyPhantomPhysicsComponentID);
+	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RIGID_BODY_PHANTOM_PHYSICS) > 0) {
+		AddComponent<RigidbodyPhantomPhysicsComponent>();
 	}
 
-	const int32_t phantomPhysicsComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::PHANTOM_PHYSICS);
-	if (markedAsPhantom || phantomPhysicsComponentID > 0) {
-		AddComponent<PhantomPhysicsComponent>(phantomPhysicsComponentID)->SetPhysicsEffectActive(false);
+	if (markedAsPhantom || compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::PHANTOM_PHYSICS) > 0) {
+		AddComponent<PhantomPhysicsComponent>()->SetPhysicsEffectActive(false);
 	}
 
-	const int32_t havokVehiclePhysicsComponentID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::HAVOK_VEHICLE_PHYSICS);
-	if (havokVehiclePhysicsComponentID > 0) {
-		auto* havokVehiclePhysicsComponent = AddComponent<HavokVehiclePhysicsComponent>(havokVehiclePhysicsComponentID);
+	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::HAVOK_VEHICLE_PHYSICS) > 0) {
+		auto* havokVehiclePhysicsComponent = AddComponent<HavokVehiclePhysicsComponent>();
 		havokVehiclePhysicsComponent->SetPosition(m_DefaultPosition);
 		havokVehiclePhysicsComponent->SetRotation(m_DefaultRotation);
 	}
@@ -658,7 +649,7 @@ void Entity::Initialize() {
 	}
 
 	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MODEL, -1) != -1 && !GetComponent<PetComponent>()) {
-		AddComponent<ModelComponent>()->LoadBehaviors();
+		AddComponent<ModelComponent>();
 		if (!HasComponent(eReplicaComponentType::DESTROYABLE)) {
 			auto* destroyableComponent = AddComponent<DestroyableComponent>();
 			destroyableComponent->SetHealth(1);
@@ -669,7 +660,7 @@ void Entity::Initialize() {
 	}
 
 	PetComponent* petComponent;
-	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::ITEM) > 0 && !TryGetComponent(eReplicaComponentType::PET, petComponent) && !HasComponent(eReplicaComponentType::MODEL)) {
+	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::ITEM) > 0) {
 		AddComponent<ItemComponent>();
 	}
 
@@ -890,7 +881,7 @@ void Entity::SetGMLevel(eGameMasterLevel value) {
 	// Update the chat server of our GM Level
 	{
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::GMLEVEL_UPDATE);
+		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::GMLEVEL_UPDATE);
 		bitStream.Write(m_ObjectID);
 		bitStream.Write(m_GMLevel);
 
@@ -910,6 +901,14 @@ void Entity::WriteBaseReplicaData(RakNet::BitStream& outBitStream, eReplicaPacke
 			for (size_t i = 0; i < name.size(); ++i) {
 				outBitStream.Write<uint16_t>(name[i]);
 			}
+		} else if (HasVar(u"userModelName")) {
+			const auto& name = GetVar<std::string>(u"userModelName");
+			outBitStream.Write<uint8_t>(uint8_t(name.size()));
+
+			for (size_t i = 0; i < name.size(); ++i) {
+				outBitStream.Write<uint16_t>(name[i]);
+			}
+
 		} else {
 			const auto& name = GetVar<std::string>(u"npcName");
 			outBitStream.Write<uint8_t>(uint8_t(name.size()));
@@ -1278,7 +1277,6 @@ void Entity::Update(const float deltaTime) {
 			auto timerName = timer.GetName();
 			m_Timers.erase(m_Timers.begin() + timerPosition);
 			GetScript()->OnTimerDone(this, timerName);
-			VanityUtilities::OnTimerDone(this, timerName);
 
 			TriggerEvent(eTriggerEventType::TIMER_DONE, this);
 		} else {
@@ -1342,7 +1340,6 @@ void Entity::OnCollisionProximity(LWOOBJID otherEntity, const std::string& proxN
 	if (!other) return;
 
 	GetScript()->OnProximityUpdate(this, other, proxName, status);
-	VanityUtilities::OnProximityUpdate(this, other, proxName, status);
 
 	RocketLaunchpadControlComponent* rocketComp = GetComponent<RocketLaunchpadControlComponent>();
 	if (!rocketComp) return;
@@ -1362,7 +1359,7 @@ void Entity::OnCollisionPhantom(const LWOOBJID otherEntity) {
 
 	SwitchComponent* switchComp = GetComponent<SwitchComponent>();
 	if (switchComp) {
-		switchComp->OnUse(other);
+		switchComp->EntityEnter(other);
 	}
 
 	TriggerEvent(eTriggerEventType::ENTER, other);
@@ -2144,8 +2141,6 @@ void Entity::ProcessPositionUpdate(PositionUpdate& update) {
 	Game::entityManager->QueueGhostUpdate(GetObjectID());
 
 	if (updateChar) Game::entityManager->SerializeEntity(this);
-
-	OnPlayerPositionUpdate.Notify(this, update);
 }
 
 const SystemAddress& Entity::GetSystemAddress() const {
@@ -2167,19 +2162,16 @@ void Entity::SetRespawnPos(const NiPoint3& position) {
 	auto* characterComponent = GetComponent<CharacterComponent>();
 	if (characterComponent) characterComponent->SetRespawnPos(position);
 }
-
 void Entity::SetRespawnRot(const NiQuaternion& rotation) {
 	auto* characterComponent = GetComponent<CharacterComponent>();
 	if (characterComponent) characterComponent->SetRespawnRot(rotation);
 }
 
-int32_t Entity::GetCollisionGroup() const {
-	for (const auto* component : m_Components | std::views::values) {
-		auto* compToCheck = dynamic_cast<const PhysicsComponent*>(component);	
-		if (compToCheck) {
-			return compToCheck->GetCollisionGroup();
+void Entity::EraseVar(const std::u16string& name) {
+	for (auto it = m_Settings.begin(); it != m_Settings.end(); ++it) {
+		if ((*it)->GetKey() == name) {
+			m_Settings.erase(it);
+			return;
 		}
 	}
-
-	return 0;
 }

dGame/Entity.h

@@ -11,7 +11,6 @@
 #include "NiQuaternion.h"
 #include "LDFFormat.h"
 #include "eKillType.h"
-#include "Observable.h"
 
 namespace Loot {
 	class Info;
@@ -107,11 +106,6 @@ public:
 
 	const SystemAddress& GetSystemAddress() const;
 
-	// Returns the collision group for this entity.
-	// Because the collision group is stored on a base component, this will look for a physics component
-	// then return the collision group from that.
-	int32_t GetCollisionGroup() const;
-
 	/**
 	 * Setters
 	 */
@@ -305,11 +299,7 @@ public:
 	// Scale will only be communicated to the client when the construction packet is sent
 	void SetScale(const float scale) { m_Scale = scale; };
 
-	/**
-	 * @brief The observable for player entity position updates.
-	 */
-	static Observable<Entity*, const PositionUpdate&> OnPlayerPositionUpdate;
-	
+	void EraseVar(const std::u16string& name);
 protected:
 	LWOOBJID m_ObjectID;
 

dGame/LeaderboardManager.cpp

@@ -1,6 +1,5 @@
 #include "LeaderboardManager.h"
 
-#include <ranges>
 #include <sstream>
 #include <utility>
 
@@ -73,191 +72,197 @@ void Leaderboard::Serialize(RakNet::BitStream& bitStream) const {
 	bitStream.Write0();
 }
 
-// Takes the resulting query from a leaderboard lookup and converts it to the LDF we need
-// to send it to a client.
-void QueryToLdf(Leaderboard& leaderboard, const std::vector<ILeaderboard::Entry>& leaderboardEntries) {
-	using enum Leaderboard::Type;
-	leaderboard.Clear();
-	if (leaderboardEntries.empty()) return;
+void Leaderboard::QueryToLdf(std::unique_ptr<sql::ResultSet>& rows) {
+	Clear();
+	if (rows->rowsCount() == 0) return;
 
-	for (const auto& leaderboardEntry : leaderboardEntries) {
+	this->entries.reserve(rows->rowsCount());
+	while (rows->next()) {
 		constexpr int32_t MAX_NUM_DATA_PER_ROW = 9;
-		auto& entry = leaderboard.PushBackEntry();
+		this->entries.push_back(std::vector<LDFBaseData*>());
+		auto& entry = this->entries.back();
 		entry.reserve(MAX_NUM_DATA_PER_ROW);
-		entry.push_back(new LDFData<uint64_t>(u"CharacterID", leaderboardEntry.charId));
-		entry.push_back(new LDFData<uint64_t>(u"LastPlayed", leaderboardEntry.lastPlayedTimestamp));
-		entry.push_back(new LDFData<int32_t>(u"NumPlayed", leaderboardEntry.numTimesPlayed));
-		entry.push_back(new LDFData<std::u16string>(u"name", GeneralUtils::ASCIIToUTF16(leaderboardEntry.name)));
-		entry.push_back(new LDFData<uint64_t>(u"RowNumber", leaderboardEntry.ranking));
-		switch (leaderboard.GetLeaderboardType()) {
-		case ShootingGallery:
-			entry.push_back(new LDFData<int32_t>(u"Score", leaderboardEntry.primaryScore));
+		entry.push_back(new LDFData<uint64_t>(u"CharacterID", rows->getInt("character_id")));
+		entry.push_back(new LDFData<uint64_t>(u"LastPlayed", rows->getUInt64("lastPlayed")));
+		entry.push_back(new LDFData<int32_t>(u"NumPlayed", rows->getInt("timesPlayed")));
+		entry.push_back(new LDFData<std::u16string>(u"name", GeneralUtils::ASCIIToUTF16(rows->getString("name").c_str())));
+		entry.push_back(new LDFData<uint64_t>(u"RowNumber", rows->getInt("ranking")));
+		switch (leaderboardType) {
+		case Type::ShootingGallery:
+			entry.push_back(new LDFData<int32_t>(u"Score", rows->getInt("primaryScore")));
 			// Score:1
-			entry.push_back(new LDFData<int32_t>(u"Streak", leaderboardEntry.secondaryScore));
+			entry.push_back(new LDFData<int32_t>(u"Streak", rows->getInt("secondaryScore")));
 			// Streak:1
-			entry.push_back(new LDFData<float>(u"HitPercentage", (leaderboardEntry.tertiaryScore / 100.0f)));
+			entry.push_back(new LDFData<float>(u"HitPercentage", (rows->getInt("tertiaryScore") / 100.0f)));
 			// HitPercentage:3 between 0 and 1
 			break;
-		case Racing:
-			entry.push_back(new LDFData<float>(u"BestTime", leaderboardEntry.primaryScore));
+		case Type::Racing:
+			entry.push_back(new LDFData<float>(u"BestTime", rows->getDouble("primaryScore")));
 			// BestLapTime:3
-			entry.push_back(new LDFData<float>(u"BestLapTime", leaderboardEntry.secondaryScore));
+			entry.push_back(new LDFData<float>(u"BestLapTime", rows->getDouble("secondaryScore")));
 			// BestTime:3
 			entry.push_back(new LDFData<int32_t>(u"License", 1));
 			// License:1 - 1 if player has completed mission 637 and 0 otherwise
-			entry.push_back(new LDFData<int32_t>(u"NumWins", leaderboardEntry.numWins));
+			entry.push_back(new LDFData<int32_t>(u"NumWins", rows->getInt("numWins")));
 			// NumWins:1
 			break;
-		case UnusedLeaderboard4:
-			entry.push_back(new LDFData<int32_t>(u"Points", leaderboardEntry.primaryScore));
+		case Type::UnusedLeaderboard4:
+			entry.push_back(new LDFData<int32_t>(u"Points", rows->getInt("primaryScore")));
 			// Points:1
 			break;
-		case MonumentRace:
-			entry.push_back(new LDFData<int32_t>(u"Time", leaderboardEntry.primaryScore));
+		case Type::MonumentRace:
+			entry.push_back(new LDFData<int32_t>(u"Time", rows->getInt("primaryScore")));
 			// Time:1(?)
 			break;
-		case FootRace:
-			entry.push_back(new LDFData<int32_t>(u"Time", leaderboardEntry.primaryScore));
+		case Type::FootRace:
+			entry.push_back(new LDFData<int32_t>(u"Time", rows->getInt("primaryScore")));
 			// Time:1
 			break;
-		case Survival:
-			entry.push_back(new LDFData<int32_t>(u"Points", leaderboardEntry.primaryScore));
-			// Points:1
-			entry.push_back(new LDFData<int32_t>(u"Time", leaderboardEntry.secondaryScore));
-			// Time:1
-			break;
-		case SurvivalNS:
-			entry.push_back(new LDFData<int32_t>(u"Wave", leaderboardEntry.primaryScore));
-			// Wave:1
-			entry.push_back(new LDFData<int32_t>(u"Time", leaderboardEntry.secondaryScore));
-			// Time:1
-			break;
-		case Donations:
-			entry.push_back(new LDFData<int32_t>(u"Score", leaderboardEntry.primaryScore));
-			// Score:1
-			break;
-		case None:
-			[[fallthrough]];
-		default:
-			break;
-		}
-	}
-}
-
-std::vector<ILeaderboard::Entry> FilterTo10(const std::vector<ILeaderboard::Entry>& leaderboard, const uint32_t relatedPlayer, const Leaderboard::InfoType infoType) {
-	std::vector<ILeaderboard::Entry> toReturn;
-
-	int32_t index = 0;
-	// for friends and top, we dont need to find this players index.
-	if (infoType == Leaderboard::InfoType::MyStanding || infoType == Leaderboard::InfoType::Friends) {
-		for (; index < leaderboard.size(); index++) {
-			if (leaderboard[index].charId == relatedPlayer) break;
-		}
-	}
-
-	if (leaderboard.size() < 10) {
-		toReturn.assign(leaderboard.begin(), leaderboard.end());
-		index = 0;
-	} else if (index < 10) {
-		toReturn.assign(leaderboard.begin(), leaderboard.begin() + 10); // get the top 10 since we are in the top 10
-		index = 0;
-	} else if (index > leaderboard.size() - 10) {
-		toReturn.assign(leaderboard.end() - 10, leaderboard.end()); // get the bottom 10 since we are in the bottom 10
-		index = leaderboard.size() - 10;
-	} else {
-		toReturn.assign(leaderboard.begin() + index - 5, leaderboard.begin() + index + 5); // get the 5 above and below
-		index -= 5;
-	}
-
-	int32_t i = index;
-	for (auto& entry : toReturn) {
-		entry.ranking = ++i;
-	}
-
-	return toReturn;
-}
-
-std::vector<ILeaderboard::Entry> FilterWeeklies(const std::vector<ILeaderboard::Entry>& leaderboard) {
-	// Filter the leaderboard to only include entries from the last week
-	const auto currentTime = std::chrono::system_clock::now();
-	auto epochTime = currentTime.time_since_epoch().count();
-	constexpr auto SECONDS_IN_A_WEEK = 60 * 60 * 24 * 7; // if you think im taking leap seconds into account thats cute.
-
-	std::vector<ILeaderboard::Entry> weeklyLeaderboard;
-	for (const auto& entry : leaderboard) {
-		if (epochTime - entry.lastPlayedTimestamp < SECONDS_IN_A_WEEK) {
-			weeklyLeaderboard.push_back(entry);
-		}
-	}
-
-	return weeklyLeaderboard;
-}
-
-std::vector<ILeaderboard::Entry> FilterFriends(const std::vector<ILeaderboard::Entry>& leaderboard, const uint32_t relatedPlayer) {
-	// Filter the leaderboard to only include friends of the player
-	auto friendOfPlayer = Database::Get()->GetFriendsList(relatedPlayer);
-	std::vector<ILeaderboard::Entry> friendsLeaderboard;
-	for (const auto& entry : leaderboard) {
-		const auto res = std::ranges::find_if(friendOfPlayer, [&entry, relatedPlayer](const FriendData& data) {
-			return entry.charId == data.friendID || entry.charId == relatedPlayer;
-			});
-		if (res != friendOfPlayer.cend()) {
-			friendsLeaderboard.push_back(entry);
-		}
-	}
-
-	return friendsLeaderboard;
-}
-
-std::vector<ILeaderboard::Entry> ProcessLeaderboard(
-	const std::vector<ILeaderboard::Entry>& leaderboard,
-	const bool weekly,
-	const Leaderboard::InfoType infoType,
-	const uint32_t relatedPlayer) {
-	std::vector<ILeaderboard::Entry> toReturn;
-
-	if (infoType == Leaderboard::InfoType::Friends) {
-		const auto friendsLeaderboard = FilterFriends(leaderboard, relatedPlayer);
-		toReturn = FilterTo10(weekly ? FilterWeeklies(friendsLeaderboard) : friendsLeaderboard, relatedPlayer, infoType);
-	} else {
-		toReturn = FilterTo10(weekly ? FilterWeeklies(leaderboard) : leaderboard, relatedPlayer, infoType);
-	}
-
-	return toReturn;
-}
-
-void Leaderboard::SetupLeaderboard(bool weekly) {
-	const auto leaderboardType = LeaderboardManager::GetLeaderboardType(gameID);
-	std::vector<ILeaderboard::Entry> leaderboardRes;
-
-	switch (leaderboardType) {
-	case Type::SurvivalNS:
-		leaderboardRes = Database::Get()->GetNsLeaderboard(gameID);
-		break;
 		case Type::Survival:
-		leaderboardRes = Database::Get()->GetAgsLeaderboard(gameID);
+			entry.push_back(new LDFData<int32_t>(u"Points", rows->getInt("primaryScore")));
+			// Points:1
+			entry.push_back(new LDFData<int32_t>(u"Time", rows->getInt("secondaryScore")));
+			// Time:1
 			break;
-	case Type::Racing:
-		[[fallthrough]];
-	case Type::MonumentRace:
-		leaderboardRes = Database::Get()->GetAscendingLeaderboard(gameID);
+		case Type::SurvivalNS:
+			entry.push_back(new LDFData<int32_t>(u"Wave", rows->getInt("primaryScore")));
+			// Wave:1
+			entry.push_back(new LDFData<int32_t>(u"Time", rows->getInt("secondaryScore")));
+			// Time:1
 			break;
-	case Type::ShootingGallery:
-		[[fallthrough]];
-	case Type::FootRace:
-		[[fallthrough]];
 		case Type::Donations:
-		[[fallthrough]];
+			entry.push_back(new LDFData<int32_t>(u"Score", rows->getInt("primaryScore")));
+			// Score:1
+			break;
 		case Type::None:
-		[[fallthrough]];
+			// This type is included here simply to resolve a compiler warning on mac about unused enum types
+			break;
 		default:
-		leaderboardRes = Database::Get()->GetDescendingLeaderboard(gameID);
 			break;
 		}
+	}
+}
 
-	const auto processedLeaderboard = ProcessLeaderboard(leaderboardRes, weekly, infoType, relatedPlayer);
+const std::string_view Leaderboard::GetOrdering(Leaderboard::Type leaderboardType) {
+	// Use a switch case and return desc for all 3 columns if higher is better and asc if lower is better
+	switch (leaderboardType) {
+	case Type::Racing:
+	case Type::MonumentRace:
+		return "primaryScore ASC, secondaryScore ASC, tertiaryScore ASC";
+	case Type::Survival:
+		return Game::config->GetValue("classic_survival_scoring") == "1" ?
+			"secondaryScore DESC, primaryScore DESC, tertiaryScore DESC" :
+			"primaryScore DESC, secondaryScore DESC, tertiaryScore DESC";
+	case Type::SurvivalNS:
+		return "primaryScore DESC, secondaryScore ASC, tertiaryScore DESC";
+	case Type::ShootingGallery:
+	case Type::FootRace:
+	case Type::UnusedLeaderboard4:
+	case Type::Donations:
+	case Type::None:
+	default:
+		return "primaryScore DESC, secondaryScore DESC, tertiaryScore DESC";
+	}
+}
 
-	QueryToLdf(*this, processedLeaderboard);
+void Leaderboard::SetupLeaderboard(bool weekly, uint32_t resultStart, uint32_t resultEnd) {
+	resultStart++;
+	resultEnd++;
+	// We need everything except 1 column so i'm selecting * from leaderboard
+	const std::string queryBase =
+		R"QUERY(
+		WITH leaderboardsRanked AS (
+			SELECT leaderboard.*, charinfo.name,
+				RANK() OVER
+				(
+				ORDER BY %s, UNIX_TIMESTAMP(last_played) ASC, id DESC
+			) AS ranking
+				FROM leaderboard JOIN charinfo on charinfo.id = leaderboard.character_id
+				WHERE game_id = ? %s
+		),
+		myStanding AS (
+			SELECT
+				ranking as myRank
+			FROM leaderboardsRanked
+			WHERE id = ?
+		),
+		lowestRanking AS (
+			SELECT MAX(ranking) AS lowestRank
+				FROM leaderboardsRanked
+		)
+		SELECT leaderboardsRanked.*, character_id, UNIX_TIMESTAMP(last_played) as lastPlayed, leaderboardsRanked.name, leaderboardsRanked.ranking FROM leaderboardsRanked, myStanding, lowestRanking
+		WHERE leaderboardsRanked.ranking
+		BETWEEN
+		LEAST(GREATEST(CAST(myRank AS SIGNED) - 5, %i), CAST(lowestRanking.lowestRank AS SIGNED) - 9)
+		AND
+		LEAST(GREATEST(myRank + 5, %i), lowestRanking.lowestRank)
+		ORDER BY ranking ASC;
+	)QUERY";
+
+	std::string friendsFilter =
+		R"QUERY(
+		AND (
+			character_id IN (
+				SELECT fr.requested_player FROM (
+					SELECT CASE
+					WHEN player_id = ? THEN friend_id
+					WHEN friend_id = ? THEN player_id
+					END AS requested_player
+					FROM friends
+				) AS fr
+				JOIN charinfo AS ci
+				ON ci.id = fr.requested_player
+				WHERE fr.requested_player IS NOT NULL
+			)
+		OR character_id = ?
+		)
+	)QUERY";
+
+	std::string weeklyFilter = " AND UNIX_TIMESTAMP(last_played) BETWEEN UNIX_TIMESTAMP(date_sub(now(),INTERVAL 1 WEEK)) AND UNIX_TIMESTAMP(now()) ";
+
+	std::string filter;
+	// Setup our filter based on the query type
+	if (this->infoType == InfoType::Friends) filter += friendsFilter;
+	if (this->weekly) filter += weeklyFilter;
+	const auto orderBase = GetOrdering(this->leaderboardType);
+
+	// For top query, we want to just rank all scores, but for all others we need the scores around a specific player
+	std::string baseLookup;
+	if (this->infoType == InfoType::Top) {
+		baseLookup = "SELECT id, last_played FROM leaderboard WHERE game_id = ? " + (this->weekly ? weeklyFilter : std::string("")) + " ORDER BY ";
+		baseLookup += orderBase.data();
+	} else {
+		baseLookup = "SELECT id, last_played FROM leaderboard WHERE game_id = ? " + (this->weekly ? weeklyFilter : std::string("")) + " AND character_id = ";
+		baseLookup += std::to_string(static_cast<uint32_t>(this->relatedPlayer));
+	}
+	baseLookup += " LIMIT 1";
+	LOG_DEBUG("query is %s", baseLookup.c_str());
+	std::unique_ptr<sql::PreparedStatement> baseQuery(Database::Get()->CreatePreppedStmt(baseLookup));
+	baseQuery->setInt(1, this->gameID);
+	std::unique_ptr<sql::ResultSet> baseResult(baseQuery->executeQuery());
+
+	if (!baseResult->next()) return; // In this case, there are no entries in the leaderboard for this game.
+
+	uint32_t relatedPlayerLeaderboardId = baseResult->getInt("id");
+
+	// Create and execute the actual save here. Using a heap allocated buffer to avoid stack overflow
+	constexpr uint16_t STRING_LENGTH = 4096;
+	std::unique_ptr<char[]> lookupBuffer = std::make_unique<char[]>(STRING_LENGTH);
+	int32_t res = snprintf(lookupBuffer.get(), STRING_LENGTH, queryBase.c_str(), orderBase.data(), filter.c_str(), resultStart, resultEnd);
+	DluAssert(res != -1);
+	std::unique_ptr<sql::PreparedStatement> query(Database::Get()->CreatePreppedStmt(lookupBuffer.get()));
+	LOG_DEBUG("Query is %s vars are %i %i %i", lookupBuffer.get(), this->gameID, this->relatedPlayer, relatedPlayerLeaderboardId);
+	query->setInt(1, this->gameID);
+	if (this->infoType == InfoType::Friends) {
+		query->setInt(2, this->relatedPlayer);
+		query->setInt(3, this->relatedPlayer);
+		query->setInt(4, this->relatedPlayer);
+		query->setInt(5, relatedPlayerLeaderboardId);
+	} else {
+		query->setInt(2, relatedPlayerLeaderboardId);
+	}
+	std::unique_ptr<sql::ResultSet> result(query->executeQuery());
+	QueryToLdf(result);
 }
 
 void Leaderboard::Send(const LWOOBJID targetID) const {
@@ -267,43 +272,129 @@ void Leaderboard::Send(const LWOOBJID targetID) const {
 	}
 }
 
+std::string FormatInsert(const Leaderboard::Type& type, const Score& score, const bool useUpdate) {
+	std::string insertStatement;
+	if (useUpdate) {
+		insertStatement =
+			R"QUERY(
+			UPDATE leaderboard
+			SET primaryScore = %f, secondaryScore = %f, tertiaryScore = %f,
+			timesPlayed = timesPlayed + 1 WHERE character_id = ? AND game_id = ?;
+			)QUERY";
+	} else {
+		insertStatement =
+			R"QUERY(
+			INSERT leaderboard SET
+			primaryScore = %f, secondaryScore = %f, tertiaryScore = %f,
+			character_id = ?, game_id = ?;
+			)QUERY";
+	}
+
+	constexpr uint16_t STRING_LENGTH = 400;
+	// Then fill in our score
+	char finishedQuery[STRING_LENGTH];
+	int32_t res = snprintf(finishedQuery, STRING_LENGTH, insertStatement.c_str(), score.GetPrimaryScore(), score.GetSecondaryScore(), score.GetTertiaryScore());
+	DluAssert(res != -1);
+	return finishedQuery;
+}
+
 void LeaderboardManager::SaveScore(const LWOOBJID& playerID, const GameID activityId, const float primaryScore, const float secondaryScore, const float tertiaryScore) {
 	const Leaderboard::Type leaderboardType = GetLeaderboardType(activityId);
 
-	const auto oldScore = Database::Get()->GetPlayerScore(playerID, activityId);
+	std::unique_ptr<sql::PreparedStatement> query(Database::Get()->CreatePreppedStmt("SELECT * FROM leaderboard WHERE character_id = ? AND game_id = ?;"));
+	query->setInt(1, playerID);
+	query->setInt(2, activityId);
+	std::unique_ptr<sql::ResultSet> myScoreResult(query->executeQuery());
 
-	ILeaderboard::Score newScore{ .primaryScore = primaryScore, .secondaryScore = secondaryScore, .tertiaryScore = tertiaryScore };
-	if (oldScore.has_value()) {
-		bool lowerScoreBetter = leaderboardType == Leaderboard::Type::Racing || leaderboardType == Leaderboard::Type::MonumentRace;
+	std::string saveQuery("UPDATE leaderboard SET timesPlayed = timesPlayed + 1 WHERE character_id = ? AND game_id = ?;");
+	Score newScore(primaryScore, secondaryScore, tertiaryScore);
+	if (myScoreResult->next()) {
+		Score oldScore;
+		bool lowerScoreBetter = false;
+		switch (leaderboardType) {
+			// Higher score better
+		case Leaderboard::Type::ShootingGallery: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			oldScore.SetSecondaryScore(myScoreResult->getInt("secondaryScore"));
+			oldScore.SetTertiaryScore(myScoreResult->getInt("tertiaryScore"));
+			break;
+		}
+		case Leaderboard::Type::FootRace: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			break;
+		}
+		case Leaderboard::Type::Survival: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			oldScore.SetSecondaryScore(myScoreResult->getInt("secondaryScore"));
+			break;
+		}
+		case Leaderboard::Type::SurvivalNS: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			oldScore.SetSecondaryScore(myScoreResult->getInt("secondaryScore"));
+			break;
+		}
+		case Leaderboard::Type::UnusedLeaderboard4:
+		case Leaderboard::Type::Donations: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			newScore.SetPrimaryScore(oldScore.GetPrimaryScore() + newScore.GetPrimaryScore());
+			break;
+		}
+		case Leaderboard::Type::Racing: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			oldScore.SetSecondaryScore(myScoreResult->getInt("secondaryScore"));
+
+			// For wins we dont care about the score, just the time, so zero out the tertiary.
+			// Wins are updated later.
+			oldScore.SetTertiaryScore(0);
+			newScore.SetTertiaryScore(0);
+			lowerScoreBetter = true;
+			break;
+		}
+		case Leaderboard::Type::MonumentRace: {
+			oldScore.SetPrimaryScore(myScoreResult->getInt("primaryScore"));
+			lowerScoreBetter = true;
+			// Do score checking here
+			break;
+		}
+		case Leaderboard::Type::None:
+		default:
+			LOG("Unknown leaderboard type %i for game %i. Cannot save score!", leaderboardType, activityId);
+			return;
+		}
 		bool newHighScore = lowerScoreBetter ? newScore < oldScore : newScore > oldScore;
 		// Nimbus station has a weird leaderboard where we need a custom scoring system
 		if (leaderboardType == Leaderboard::Type::SurvivalNS) {
-			newHighScore = newScore.primaryScore > oldScore->primaryScore ||
-				(newScore.primaryScore == oldScore->primaryScore && newScore.secondaryScore < oldScore->secondaryScore);
+			newHighScore = newScore.GetPrimaryScore() > oldScore.GetPrimaryScore() ||
+				(newScore.GetPrimaryScore() == oldScore.GetPrimaryScore() && newScore.GetSecondaryScore() < oldScore.GetSecondaryScore());
 		} else if (leaderboardType == Leaderboard::Type::Survival && Game::config->GetValue("classic_survival_scoring") == "1") {
-			ILeaderboard::Score oldScoreFlipped{oldScore->secondaryScore, oldScore->primaryScore, oldScore->tertiaryScore};
-			ILeaderboard::Score newScoreFlipped{newScore.secondaryScore, newScore.primaryScore, newScore.tertiaryScore};
+			Score oldScoreFlipped(oldScore.GetSecondaryScore(), oldScore.GetPrimaryScore());
+			Score newScoreFlipped(newScore.GetSecondaryScore(), newScore.GetPrimaryScore());
 			newHighScore = newScoreFlipped > oldScoreFlipped;
 		}
-
 		if (newHighScore) {
-			Database::Get()->UpdateScore(playerID, activityId, newScore);
-		} else {
-			Database::Get()->IncrementTimesPlayed(playerID, activityId);
+			saveQuery = FormatInsert(leaderboardType, newScore, true);
 		}
 	} else {
-		Database::Get()->SaveScore(playerID, activityId, newScore);
+		saveQuery = FormatInsert(leaderboardType, newScore, false);
 	}
+	LOG("save query %s %i %i", saveQuery.c_str(), playerID, activityId);
+	std::unique_ptr<sql::PreparedStatement> saveStatement(Database::Get()->CreatePreppedStmt(saveQuery));
+	saveStatement->setInt(1, playerID);
+	saveStatement->setInt(2, activityId);
+	saveStatement->execute();
 
 	// track wins separately
 	if (leaderboardType == Leaderboard::Type::Racing && tertiaryScore != 0.0f) {
-		Database::Get()->IncrementNumWins(playerID, activityId);
+		std::unique_ptr<sql::PreparedStatement> winUpdate(Database::Get()->CreatePreppedStmt("UPDATE leaderboard SET numWins = numWins + 1 WHERE character_id = ? AND game_id = ?;"));
+		winUpdate->setInt(1, playerID);
+		winUpdate->setInt(2, activityId);
+		winUpdate->execute();
 	}
 }
 
-void LeaderboardManager::SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID) {
+void LeaderboardManager::SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID, const uint32_t resultStart, const uint32_t resultEnd) {
 	Leaderboard leaderboard(gameID, infoType, weekly, playerID, GetLeaderboardType(gameID));
-	leaderboard.SetupLeaderboard(weekly);
+	leaderboard.SetupLeaderboard(weekly, resultStart, resultEnd);
 	leaderboard.Send(targetID);
 }
 

dGame/LeaderboardManager.h

@@ -9,10 +9,46 @@
 #include "dCommonVars.h"
 #include "LDFFormat.h"
 
+namespace sql {
+	class ResultSet;
+};
+
 namespace RakNet {
 	class BitStream;
 };
 
+class Score {
+public:
+	Score() {
+		primaryScore = 0;
+		secondaryScore = 0;
+		tertiaryScore = 0;
+	}
+	Score(const float primaryScore, const float secondaryScore = 0, const float tertiaryScore = 0) {
+		this->primaryScore = primaryScore;
+		this->secondaryScore = secondaryScore;
+		this->tertiaryScore = tertiaryScore;
+	}
+	bool operator<(const Score& rhs) const {
+		return primaryScore < rhs.primaryScore || (primaryScore == rhs.primaryScore && secondaryScore < rhs.secondaryScore) || (primaryScore == rhs.primaryScore && secondaryScore == rhs.secondaryScore && tertiaryScore < rhs.tertiaryScore);
+	}
+	bool operator>(const Score& rhs) const {
+		return primaryScore > rhs.primaryScore || (primaryScore == rhs.primaryScore && secondaryScore > rhs.secondaryScore) || (primaryScore == rhs.primaryScore && secondaryScore == rhs.secondaryScore && tertiaryScore > rhs.tertiaryScore);
+	}
+	void SetPrimaryScore(const float score) { primaryScore = score; }
+	float GetPrimaryScore() const { return primaryScore; }
+
+	void SetSecondaryScore(const float score) { secondaryScore = score; }
+	float GetSecondaryScore() const { return secondaryScore; }
+
+	void SetTertiaryScore(const float score) { tertiaryScore = score; }
+	float GetTertiaryScore() const { return tertiaryScore; }
+private:
+	float primaryScore;
+	float secondaryScore;
+	float tertiaryScore;
+};
+
 using GameID = uint32_t;
 
 class Leaderboard {
@@ -60,16 +96,20 @@ public:
 	 * @param resultStart The index to start the leaderboard at. Zero indexed.
 	 * @param resultEnd The index to end the leaderboard at. Zero indexed.
 	 */
-	void SetupLeaderboard(bool weekly);
+	void SetupLeaderboard(bool weekly, uint32_t resultStart = 0, uint32_t resultEnd = 10);
 
 	/**
 	 * Sends the leaderboard to the client specified by targetID.
 	 */
 	void Send(const LWOOBJID targetID) const;
 
-	
-
+	// Helper function to get the columns, ordering and insert format for a leaderboard
+	static const std::string_view GetOrdering(Type leaderboardType);
 private:
+	// Takes the resulting query from a leaderboard lookup and converts it to the LDF we need
+	// to send it to a client.
+	void QueryToLdf(std::unique_ptr<sql::ResultSet>& rows);
+
 	using LeaderboardEntry = std::vector<LDFBaseData*>;
 	using LeaderboardEntries = std::vector<LeaderboardEntry>;
 
@@ -79,18 +119,10 @@ private:
 	InfoType infoType;
 	Leaderboard::Type leaderboardType;
 	bool weekly;
-public:
-	LeaderboardEntry& PushBackEntry() {
-		return entries.emplace_back();
-	}
-
-	Type GetLeaderboardType() const {
-		return leaderboardType;
-	}
 };
 
 namespace LeaderboardManager {
-	void SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID);
+	void SendLeaderboard(const GameID gameID, const Leaderboard::InfoType infoType, const bool weekly, const LWOOBJID playerID, const LWOOBJID targetID, const uint32_t resultStart = 0, const uint32_t resultEnd = 10);
 
 	void SaveScore(const LWOOBJID& playerID, const GameID activityId, const float primaryScore, const float secondaryScore = 0, const float tertiaryScore = 0);
 

dGame/User.cpp

@@ -12,7 +12,6 @@ User::User(const SystemAddress& sysAddr, const std::string& username, const std:
 	m_AccountID = 0;
 	m_Username = "";
 	m_SessionKey = "";
-	m_MuteExpire = 0;
 
 	m_MaxGMLevel = eGameMasterLevel::CIVILIAN; //The max GM level this account can assign to it's characters
 	m_LastCharID = 0;

dGame/User.h

@@ -25,7 +25,7 @@ public:
 	User& operator=(const User& other);
 	bool operator==(const User& other) const;
 
-	uint32_t GetAccountID() const noexcept { return m_AccountID; }
+	uint32_t GetAccountID() { return m_AccountID; }
 	std::string& GetUsername() { return m_Username; }
 	std::string& GetSessionKey() { return m_SessionKey; }
 	SystemAddress& GetSystemAddress() { return m_SystemAddress; }

dGame/UserManager.cpp

@@ -26,7 +26,7 @@
 #include "eCharacterCreationResponse.h"
 #include "eRenameResponse.h"
 #include "eConnectionType.h"
-#include "MessageType/Chat.h"
+#include "eChatMessageType.h"
 #include "BitStreamUtils.h"
 #include "CheatDetection.h"
 
@@ -216,7 +216,7 @@ void UserManager::RequestCharacterList(const SystemAddress& sysAddr) {
 	}
 
 	RakNet::BitStream bitStream;
-	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, MessageType::Client::CHARACTER_LIST_RESPONSE);
+	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHARACTER_LIST_RESPONSE);
 
 	std::vector<Character*> characters = u->GetCharacters();
 	bitStream.Write<uint8_t>(characters.size());
@@ -422,7 +422,7 @@ void UserManager::DeleteCharacter(const SystemAddress& sysAddr, Packet* packet)
 		Database::Get()->DeleteCharacter(charID);
 
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::UNEXPECTED_DISCONNECT);
+		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::UNEXPECTED_DISCONNECT);
 		bitStream.Write(objectID);
 		Game::chatServer->Send(&bitStream, SYSTEM_PRIORITY, RELIABLE, 0, Game::chatSysAddr, false);
 

dGame/dBehaviors/BehaviorContext.cpp

@@ -105,7 +105,7 @@ void BehaviorContext::ExecuteUpdates() {
 	this->scheduledUpdates.clear();
 }
 
-bool BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bitStream) {
+void BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bitStream) {
 	BehaviorSyncEntry entry;
 	auto found = false;
 
@@ -128,7 +128,7 @@ bool BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bit
 	if (!found) {
 		LOG("Failed to find behavior sync entry with sync id (%i)!", syncId);
 
-		return false;
+		return;
 	}
 
 	auto* behavior = entry.behavior;
@@ -137,11 +137,10 @@ bool BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bit
 	if (behavior == nullptr) {
 		LOG("Invalid behavior for sync id (%i)!", syncId);
 
-		return false;
+		return;
 	}
 
 	behavior->Sync(this, bitStream, branch);
-	return true;
 }
 
 
@@ -199,26 +198,6 @@ void BehaviorContext::UpdatePlayerSyncs(float deltaTime) {
 			i++;
 			continue;
 		}
-
-		if (this->skillUId != 0 && !clientInitalized) {
-			EchoSyncSkill echo;
-			echo.bDone = true;
-			echo.uiSkillHandle = this->skillUId;
-			echo.uiBehaviorHandle = entry.handle;
-
-			RakNet::BitStream bitStream{};
-			entry.behavior->SyncCalculation(this, bitStream, entry.branchContext);
-
-			echo.sBitStream.assign(reinterpret_cast<char*>(bitStream.GetData()), bitStream.GetNumberOfBytesUsed());
-
-			RakNet::BitStream message;
-			BitStreamUtils::WriteHeader(message, eConnectionType::CLIENT, MessageType::Client::GAME_MSG);
-			message.Write(this->originator);
-			echo.Serialize(message);
-
-			Game::server->Send(message, UNASSIGNED_SYSTEM_ADDRESS, true);
-		}
-
 		this->syncEntries.erase(this->syncEntries.begin() + i);
 	}
 }
@@ -285,7 +264,7 @@ bool BehaviorContext::CalculateUpdate(const float deltaTime) {
 			// Write message
 			RakNet::BitStream message;
 
-			BitStreamUtils::WriteHeader(message, eConnectionType::CLIENT, MessageType::Client::GAME_MSG);
+			BitStreamUtils::WriteHeader(message, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 			message.Write(this->originator);
 			echo.Serialize(message);
 

dGame/dBehaviors/BehaviorContext.h

@@ -93,7 +93,7 @@ struct BehaviorContext
 
 	void ExecuteUpdates();
 
-	bool SyncBehavior(uint32_t syncId, RakNet::BitStream& bitStream);
+	void SyncBehavior(uint32_t syncId, RakNet::BitStream& bitStream);
 
 	void Update(float deltaTime);
 

dGame/dBehaviors/CMakeLists.txt

@@ -55,7 +55,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"VerifyBehavior.cpp")
 
 add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES})
-target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum)
+target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics)
 target_include_directories(dBehaviors PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
 	PRIVATE

dGame/dBehaviors/ChangeIdleFlagsBehavior.h

@@ -1,7 +1,7 @@
 
 #pragma once
 #include "Behavior.h"
-#include "eAnimationFlags.h"
+#include "eAninmationFlags.h"
 
 class ChangeIdleFlagsBehavior final : public Behavior {
 public:

dGame/dBehaviors/DamageAbsorptionBehavior.cpp

@@ -27,8 +27,6 @@ void DamageAbsorptionBehavior::Handle(BehaviorContext* context, RakNet::BitStrea
 	destroyable->SetIsShielded(true);
 
 	context->RegisterTimerBehavior(this, branch, target->GetObjectID());
-
-	Game::entityManager->SerializeEntity(target);
 }
 
 void DamageAbsorptionBehavior::Calculate(BehaviorContext* context, RakNet::BitStream& bitStream, BehaviorBranchContext branch) {
@@ -54,13 +52,7 @@ void DamageAbsorptionBehavior::Timer(BehaviorContext* context, BehaviorBranchCon
 
 	const auto toRemove = std::min(present, this->m_absorbAmount);
 
-	const auto remaining = present - toRemove;
-
-	destroyable->SetDamageToAbsorb(remaining);
-
-	destroyable->SetIsShielded(remaining > 0);
-
-	Game::entityManager->SerializeEntity(target);
+	destroyable->SetDamageToAbsorb(present - toRemove);
 }
 
 void DamageAbsorptionBehavior::Load() {

dGame/dComponents/ActivityComponent.cpp

@@ -21,7 +21,7 @@
 #include "eMissionTaskType.h"
 #include "eMatchUpdate.h"
 #include "eConnectionType.h"
-#include "MessageType/Chat.h"
+#include "eChatMessageType.h"
 
 #include "CDCurrencyTableTable.h"
 #include "CDActivityRewardsTable.h"
@@ -501,7 +501,7 @@ void ActivityInstance::StartZone() {
 	// only make a team if we have more than one participant
 	if (participants.size() > 1) {
 		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, MessageType::Chat::CREATE_TEAM);
+		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CHAT, eChatMessageType::CREATE_TEAM);
 
 		bitStream.Write(leader->GetObjectID());
 		bitStream.Write(m_Participants.size());

dGame/dComponents/BaseCombatAIComponent.cpp

@@ -16,7 +16,6 @@
 #include "DestroyableComponent.h"
 
 #include <algorithm>
-#include <ranges>
 #include <sstream>
 #include <vector>
 
@@ -30,15 +29,13 @@
 
 BaseCombatAIComponent::BaseCombatAIComponent(Entity* parent, const uint32_t id): Component(parent) {
 	m_Target = LWOOBJID_EMPTY;
-	m_DirtyStateOrTarget = true;
-	m_State = AiState::spawn;
+	SetAiState(AiState::spawn);
 	m_Timer = 1.0f;
 	m_StartPosition = parent->GetPosition();
 	m_MovementAI = nullptr;
 	m_Disabled = false;
 	m_SkillEntries = {};
 	m_SoftTimer = 5.0f;
-	m_ForcedTetherTime = 0.0f;
 
 	//Grab the aggro information from BaseCombatAI:
 	auto componentQuery = CDClientDatabase::CreatePreppedStmt(
@@ -172,17 +169,6 @@ void BaseCombatAIComponent::Update(const float deltaTime) {
 			GameMessages::SendStopFXEffect(m_Parent, true, "tether");
 			m_TetherEffectActive = false;
 		}
-		m_ForcedTetherTime -= deltaTime;
-		if (m_ForcedTetherTime >= 0) return;
-	}
-
-	for (auto entry = m_RemovedThreatList.begin(); entry != m_RemovedThreatList.end();) {
-		entry->second -= deltaTime;
-		if (entry->second <= 0.0f) {
-			entry = m_RemovedThreatList.erase(entry);
-		} else {
-			++entry;
-		}
 	}
 
 	if (m_SoftTimer <= 0.0f) {
@@ -300,7 +286,40 @@ void BaseCombatAIComponent::CalculateCombat(const float deltaTime) {
 	}
 
 	if (!m_TetherEffectActive && m_OutOfCombat && (m_OutOfCombatTime -= deltaTime) <= 0) {
-		TetherLogic();
+		auto* destroyableComponent = m_Parent->GetComponent<DestroyableComponent>();
+
+		if (destroyableComponent != nullptr && destroyableComponent->HasFaction(4)) {
+			auto serilizationRequired = false;
+
+			if (destroyableComponent->GetHealth() != destroyableComponent->GetMaxHealth()) {
+				destroyableComponent->SetHealth(destroyableComponent->GetMaxHealth());
+
+				serilizationRequired = true;
+			}
+
+			if (destroyableComponent->GetArmor() != destroyableComponent->GetMaxArmor()) {
+				destroyableComponent->SetArmor(destroyableComponent->GetMaxArmor());
+
+				serilizationRequired = true;
+			}
+
+			if (serilizationRequired) {
+				Game::entityManager->SerializeEntity(m_Parent);
+			}
+
+			GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 6270, u"tether", "tether");
+
+			m_TetherEffectActive = true;
+
+			m_TetherTime = 3.0f;
+		}
+
+		// Speed towards start position
+		if (m_MovementAI != nullptr) {
+			m_MovementAI->SetHaltDistance(0);
+			m_MovementAI->SetMaxSpeed(m_PursuitSpeed);
+			m_MovementAI->SetDestination(m_StartPosition);
+		}
 
 		m_OutOfCombat = false;
 		m_OutOfCombatTime = 0.0f;
@@ -479,7 +498,7 @@ std::vector<LWOOBJID> BaseCombatAIComponent::GetTargetWithinAggroRange() const {
 
 		const auto distance = Vector3::DistanceSquared(m_Parent->GetPosition(), other->GetPosition());
 
-		if (distance > m_AggroRadius * m_AggroRadius || m_RemovedThreatList.contains(id)) continue;
+		if (distance > m_AggroRadius * m_AggroRadius) continue;
 
 		targets.push_back(id);
 	}
@@ -606,7 +625,6 @@ const NiPoint3& BaseCombatAIComponent::GetStartPosition() const {
 
 void BaseCombatAIComponent::ClearThreat() {
 	m_ThreatEntries.clear();
-	m_Target = LWOOBJID_EMPTY;
 
 	m_DirtyThreat = true;
 }
@@ -787,55 +805,3 @@ void BaseCombatAIComponent::Wake() {
 	m_dpEntity->SetSleeping(false);
 	m_dpEntityEnemy->SetSleeping(false);
 }
-
-void BaseCombatAIComponent::TetherLogic() {
-	auto* destroyableComponent = m_Parent->GetComponent<DestroyableComponent>();
-
-	if (destroyableComponent != nullptr && destroyableComponent->HasFaction(4)) {
-		auto serilizationRequired = false;
-
-		if (destroyableComponent->GetHealth() != destroyableComponent->GetMaxHealth()) {
-			destroyableComponent->SetHealth(destroyableComponent->GetMaxHealth());
-
-			serilizationRequired = true;
-		}
-
-		if (destroyableComponent->GetArmor() != destroyableComponent->GetMaxArmor()) {
-			destroyableComponent->SetArmor(destroyableComponent->GetMaxArmor());
-
-			serilizationRequired = true;
-		}
-
-		if (serilizationRequired) {
-			Game::entityManager->SerializeEntity(m_Parent);
-		}
-
-		GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 6270, u"tether", "tether");
-
-		m_TetherEffectActive = true;
-
-		m_TetherTime = 3.0f;
-	}
-
-	// Speed towards start position
-	if (m_MovementAI != nullptr) {
-		m_MovementAI->SetHaltDistance(0);
-		m_MovementAI->SetMaxSpeed(m_PursuitSpeed);
-		m_MovementAI->SetDestination(m_StartPosition);
-	}
-}
-
-void BaseCombatAIComponent::ForceTether() {
-	SetTarget(LWOOBJID_EMPTY);
-	m_ThreatEntries.clear();
-	TetherLogic();
-	m_ForcedTetherTime = m_TetherTime;
-
-	SetAiState(AiState::aggro);
-}
-
-void BaseCombatAIComponent::IgnoreThreat(const LWOOBJID threat, const float value) {
-	m_RemovedThreatList[threat] = value;
-	SetThreat(threat, 0.0f);
-	m_Target = LWOOBJID_EMPTY;
-}

dGame/dComponents/BaseCombatAIComponent.h

@@ -224,16 +224,6 @@ public:
 	 */
 	void Wake();
 
-	// Force this entity to tether and ignore all other actions
-	void ForceTether();
-
-	// heals the entity to full health and armor
-	// and tethers them to their spawn point
-	void TetherLogic();
-
-	// Ignore a threat for a certain amount of time
-	void IgnoreThreat(const LWOOBJID target, const float time);
-
 private:
 	/**
 	 * Returns the current target or the target that currently is the largest threat to this entity
@@ -392,12 +382,6 @@ private:
 	 */
 	bool m_DirtyStateOrTarget = false;
 
-	// The amount of time the entity will be forced to tether for
-	float m_ForcedTetherTime = 0.0f;
-
-	// The amount of time a removed threat will be ignored for. 
-	std::map<LWOOBJID, float> m_RemovedThreatList;
-
 	/**
 	 * Whether the current entity is a mech enemy, needed as mechs tether radius works differently
 	 * @return whether this entity is a mech

dGame/dComponents/CMakeLists.txt

@@ -79,4 +79,4 @@ target_include_directories(dComponents PUBLIC "."
 )
 target_precompile_headers(dComponents REUSE_FROM dGameBase)
 
-target_link_libraries(dComponents PUBLIC magic_enum::magic_enum INTERFACE dBehaviors)
+target_link_libraries(dComponents INTERFACE dBehaviors)

dGame/dComponents/CharacterComponent.h

@@ -25,8 +25,6 @@ struct ZoneStatistics {
 	uint64_t m_CoinsCollected;
 	uint64_t m_EnemiesSmashed;
 	uint64_t m_QuickBuildsCompleted;
-
-	bool operator==(const ZoneStatistics& rhs) const = default;
 };
 
 /**
@@ -309,14 +307,6 @@ public:
 
 	void SetDroppedCoins(const uint64_t value) { m_DroppedCoins = value; };
 
-	const std::array<uint64_t, 4>& GetClaimCodes() const { return m_ClaimCodes; };
-
-	const std::map<LWOMAPID, ZoneStatistics>& GetZoneStatistics() const { return m_ZoneStatistics; };
-
-	const std::u16string& GetLastRocketConfig() const { return m_LastRocketConfig; };
-
-	uint64_t GetTotalTimePlayed() const { return m_TotalTimePlayed; };
-
 	/**
 	 * Character info regarding this character, including clothing styles, etc.
 	 */

dGame/dComponents/Component.cpp

@@ -1,5 +1,18 @@
 #include "Component.h"
 
+
+Component::Component(Entity* parent) {
+	m_Parent = parent;
+}
+
+Component::~Component() {
+
+}
+
+Entity* Component::GetParent() const {
+	return m_Parent;
+}
+
 void Component::Update(float deltaTime) {
 
 }

dGame/dComponents/Component.h

@@ -2,10 +2,6 @@
 
 #include "tinyxml2.h"
 
-namespace RakNet {
-	class BitStream;
-};
-
 class Entity;
 
 /**
@@ -13,15 +9,14 @@ class Entity;
  */
 class Component {
 public:
-	Component() = default;
-	Component(Entity* parent) : m_Parent{ parent } {}
-	virtual ~Component() = default;
+	Component(Entity* parent);
+	virtual ~Component();
 
 	/**
 	 * Gets the owner of this component
 	 * @return the owner of this component
 	 */
-	Entity* GetParent() const { return m_Parent; }
+	Entity* GetParent() const;
 
 	/**
 	 * Updates the component in the game loop

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -15,7 +15,7 @@
 #include "LevelProgressionComponent.h"
 #include "eStateChangeType.h"
 
-ControllablePhysicsComponent::ControllablePhysicsComponent(Entity* entity, int32_t componentId) : PhysicsComponent(entity, componentId) {
+ControllablePhysicsComponent::ControllablePhysicsComponent(Entity* entity) : PhysicsComponent(entity) {
 	m_Velocity = {};
 	m_AngularVelocity = {};
 	m_InJetpackMode = false;
@@ -187,7 +187,7 @@ void ControllablePhysicsComponent::UpdateXml(tinyxml2::XMLDocument& doc) {
 
 	auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 
-	if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+	// if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
 		character->SetAttribute("lzx", m_Position.x);
 		character->SetAttribute("lzy", m_Position.y);
 		character->SetAttribute("lzz", m_Position.z);
@@ -195,7 +195,7 @@ void ControllablePhysicsComponent::UpdateXml(tinyxml2::XMLDocument& doc) {
 		character->SetAttribute("lzry", m_Rotation.y);
 		character->SetAttribute("lzrz", m_Rotation.z);
 		character->SetAttribute("lzrw", m_Rotation.w);
-	}
+	// }
 }
 
 void ControllablePhysicsComponent::SetPosition(const NiPoint3& pos) {

dGame/dComponents/ControllablePhysicsComponent.h

@@ -23,7 +23,7 @@ class ControllablePhysicsComponent : public PhysicsComponent {
 public:
 	static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::CONTROLLABLE_PHYSICS;
 
-	ControllablePhysicsComponent(Entity* entity, int32_t componentId);
+	ControllablePhysicsComponent(Entity* entity);
 	~ControllablePhysicsComponent() override;
 
 	void Update(float deltaTime) override;