Sync upstream fixes, spawn management, and small PR integrations

.env.example

@@ -1,7 +1,7 @@
 # Full path to the LEGO Universe client
 CLIENT_PATH=./client
 # Updates NET_VERSION in CMakeVariables.txt
-NET_VERSION=171022
+CLIENT_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')
 ACCOUNT_MANAGER_SECRET=

.github/copilot-instructions.md

@@ -1,29 +1,154 @@
-# GitHub Copilot Instructions
-
- * c++20 standard, please use the latest features except NO modules.
-   * use `.contains` for searching in associative containers
- * use const as much as possible.  If it can be const, it should be made const
- * DO NOT USE const_cast EVER.
- * use `cstdint` bitwidth types ALWAYS for integral types.
- * NEVER use std::wstring. If wide strings are necessary, use std::u16string with conversion utilties in GeneralUtils.h.
- * Functions are ALWAYS PascalCase.
- * local variables are camelCase
- * NEVER use snake case
- * indentation is TABS, not SPACES.
- * TABS are 4 spaces by default
- * Use trailing braces ALWAYS
- * global variables are prefixed with `g_`
- * if global variables or functions are needed, they should be located in an anonymous namespace
- * Use `GeneralUtils::TryParse` for ANY parsing of strings to integrals.
- * Use brace initialization when possible.
- * ALWAYS default initialize variables.
- * Pointers should be avoided unless necessary. Use references when the pointer has been checked and should not be null
- * headers should be as compact as possible. Do NOT include extra data that isnt needed.
- * Remember to include logs (LOG macro uses printf style logging) while putting verbose logs under LOG_DEBUG.
- * NEVER USE `RakNet::BitStream::ReadBit`
- * NEVER assume pointers are good, always check if they are null. Once a pointer is checked and is known to be non-null, further accesses no longer need checking
- * Be wary of TOCTOU. Prevent all possible issues relating to TOCTOU.
- * new memory allocations should never be used unless absolutely necessary.
-    * new for reconstruction of objects is allowed
- * Prefer following the format of the file over correct formatting.  Consistency over correctness.
- * When using auto, ALWAYS put a * for pointers.
+# Darkflame Universe Server Development Instructions
+
+Darkflame Universe (DLU) is a LEGO Universe server emulator written in C++ with a multi-server architecture (AuthServer, ChatServer, MasterServer, WorldServer). Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.
+
+## Working Effectively
+
+### Bootstrap, Build, and Test - REQUIRED STEPS
+Execute these commands in order for ANY development work. NEVER CANCEL builds - they take time but work reliably:
+
+```bash
+# 1. Install system dependencies (Ubuntu/Debian)
+sudo apt update && sudo apt install -y build-essential gcc zlib1g-dev libssl-dev openssl mariadb-server cmake
+
+# 2. Initialize git submodules (CRITICAL - project won't build without this)
+git submodule update --init --recursive
+
+# 3. Build using the provided script
+./build.sh -j2
+```
+- **Build time: ~6 minutes. NEVER CANCEL. Set timeout to 720+ seconds (12+ minutes).**
+- **Uses CMake 3.25-3.31 (confirmed working with 3.31.6)**
+- **Requires g++11+ (confirmed working with g++ 13.3.0)**
+
+### Alternative Build Methods
+```bash
+# Using CMake presets (CI-style)
+cmake --workflow --preset ci-ubuntu-22.04
+
+# Manual CMake (for custom configurations)
+mkdir -p build && cd build
+cmake -DCMAKE_BUILD_TYPE="Release" ..
+cmake --build . --config Release -j2
+```
+- **Same timing: ~6 minutes. NEVER CANCEL. Set timeout to 720+ seconds.**
+
+### Run Tests
+```bash
+cd build
+ctest --output-on-failure
+```
+- **Test time: <4 seconds. Set timeout to 30+ seconds.**
+- **91 tests run, all should pass**
+- **Tests are built automatically when ENABLE_TESTING=1 in CMakeVariables.txt**
+
+### Database Setup (for runtime testing)
+```bash
+# Start MariaDB
+sudo systemctl start mysql
+
+# Create test database and user
+sudo mysql -e "CREATE USER 'testuser'@'localhost' IDENTIFIED BY 'testpass'; GRANT ALL ON *.* TO 'testuser'@'localhost' WITH GRANT OPTION; FLUSH PRIVILEGES; CREATE DATABASE testdarkflame;"
+```
+
+## Validation
+
+### Build Validation
+- **ALWAYS run the bootstrapping steps first** before making any code changes
+- **ALWAYS build and test your changes** before considering them complete
+- Build output should include all server binaries: AuthServer, ChatServer, MasterServer, WorldServer
+- Build directory contains required files: `*.ini` configs, `navmeshes/`, `migrations/`, `vanity/`, `blocklist.dcf`, `libmariadbcpp.so`
+
+### Runtime Validation
+The servers can be started for basic validation:
+```bash
+cd build
+./MasterServer
+```
+- **Server will start but complain about missing client files (this is expected)**
+- **Database connections work with proper configuration in sharedconfig.ini**
+- **For full server testing, LEGO Universe client files are required (not available in this repository)**
+
+### Code Validation
+**ALWAYS validate your changes by**:
+1. Building successfully with no new compilation errors
+2. Running the test suite and confirming all tests pass
+3. Starting MasterServer to verify basic functionality
+4. **Use .editorconfig** - code style uses tabs (width=4), Unix line endings, trailing whitespace removal
+
+## Common Tasks
+
+### Project Structure
+```
+/home/runner/work/DarkflameServer/DarkflameServer/
+├── dAuthServer/          # Authentication server code
+├── dChatServer/          # Chat server code  
+├── dMasterServer/        # Master server (main coordinator)
+├── dWorldServer/         # World/game server code
+├── dCommon/              # Shared common utilities
+├── dDatabase/            # Database abstraction layer
+├── dGame/                # Core game logic, components, behaviors
+├── dScripts/             # Game scripts (NPCs, quests, etc.)
+├── dNet/                 # Network utilities
+├── dPhysics/             # Physics integration
+├── tests/                # Unit tests (GoogleTest)
+├── migrations/           # Database schema migrations
+├── thirdparty/           # External dependencies
+├── build.sh              # Main build script
+├── CMakeVariables.txt    # Build configuration variables
+└── CMakePresets.json     # CMake preset configurations
+```
+
+### Key Files to Know
+- **CMakeVariables.txt**: Build configuration (testing enabled, MariaDB jobs, etc.)
+- **build/sharedconfig.ini**: Database connection, client location, server settings
+- **build/masterconfig.ini**: Master server port and startup configuration
+- **CONTRIBUTING.md**: Code style guidelines and commit message format
+- **docs/Commands.md**: Complete list of in-game server commands
+
+### Build Configuration
+Located in `CMakeVariables.txt`:
+- `ENABLE_TESTING=1` - Unit tests enabled (keep enabled)
+- `MARIADB_CONNECTOR_COMPILE_JOBS=1` - Parallel compilation jobs for MariaDB connector
+- `CDCLIENT_CACHE_ALL=0` - Database caching strategy
+
+### Common Commands Reference
+```bash
+# Build from clean state
+rm -rf build && ./build.sh -j2
+
+# Run specific test
+cd build && ctest -R "TestName" --output-on-failure
+
+# Check which servers were built
+cd build && ls -la *Server
+
+# View build configuration
+cat CMakeVariables.txt
+
+# Check git submodules status
+git submodule status
+```
+
+### Important Notes
+- **Client files are NOT included** - this is only the server emulator
+- **Database can use SQLite or MariaDB** - SQLite recommended for development since it's lighter and doesn't require an external service
+- **Multi-server architecture** requires all 4 servers to run a complete setup
+- **Network ports**: Auth (1001), Chat (2005), Master (2000), World (3000+)
+- **Development uses Debug builds**, production uses Release builds
+- **GM level 0** = normal player, **GM level 8-9** = admin privileges
+
+## Troubleshooting
+- **"Asset bundle not found"**: Expected without LEGO Universe client files
+- **"Submodule errors"**: Run `git submodule update --init --recursive`
+- **"CMake version errors"**: Requires CMake 3.25-3.31
+- **"MariaDB connection errors"**: Check database setup and sharedconfig.ini
+- **"Permission denied on port"**: Run `sudo setcap 'cap_net_bind_service=+ep' AuthServer` for ports <1024
+
+### CI Information
+- **GitHub Actions** runs builds on Windows, Ubuntu, and macOS  
+- **Build matrix** tests multiple configurations via CMake presets
+- **All tests must pass** for CI to succeed
+- **Build artifacts** are automatically generated and uploaded
+
+**Remember: This is a complex game server requiring LEGO Universe client files for full functionality, but the server has the capability to mock everything that's needed to test without the client since cdclient can be mocked and the database can be mocked as well.**

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

@@ -34,12 +34,12 @@ jobs:
       if: ${{ matrix.os == 'windows-2025' }}
       uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3
       with:
-        vs-version: '[17,18)'
+        vs-version: '[18,19)'
         msbuild-architecture: x64
-    - name: Get CMake 3.x
+    - name: Get CMake
       uses: lukka/get-cmake@591817e96fcad43505fb4eae36172462abb3a42e # v4.3.3
       with:
-        cmakeVersion: "~3.25.0"
+        cmakeVersion: "latest"
     - name: cmake
       uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9
       with:

CMakeLists.txt

@@ -16,10 +16,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
-	set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
-endif()
-
 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
@@ -219,7 +215,7 @@ file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PRO
 file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
 
 # Copy vanity files on first build
-set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "root.xml" "dev-tribute.xml" "atm.xml" "demo.xml")
+set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "dev-tribute.xml" "atm.xml" "demo.xml")
 
 foreach(file ${VANITY_FILES})
 	configure_file("${CMAKE_SOURCE_DIR}/vanity/${file}" "${CMAKE_BINARY_DIR}/vanity/${file}" COPYONLY)

CMakePresets.json

@@ -49,7 +49,7 @@
 			"inherits": "default",
 			"displayName": "[Multi] Windows (MSVC)",
 			"description": "Set architecture to 64-bit (b/c RakNet)",
-			"generator": "Visual Studio 17 2022",
+			"generator": "Visual Studio 18 2026",
 			"binaryDir": "${sourceDir}/build/msvc",
 			"architecture": {
 				"value": "x64"

README.md

@@ -419,8 +419,8 @@ at once. For that:
 
 - [Install Docker Desktop](https://docs.docker.com/get-docker/)
 - Open the directory that contains your LU Client
-  - If the `legouniverse.exe` is in a subfolder called `client`, you're good to go. There may also be a folder `versions`.
-  - Otherwise, create a new `client` folder and move the exe and everything else (e.g. `res` and `locale`) in there. This is necessary to work around a bug in the client that will prevent that you to log back in after getting disconnected.
+  - If the `legouniverse.exe` is in a subfolder called `client`, copy & paste it to the current directory.
+  - Create the `client` folder if it does not exist. If you created the `client` folder, move everything (e.g. `res` and `locale`) in there. This is necessary to work around a bug in the client that will prevent that you to log back in after getting disconnected.
 - Download the [docker-compose.yml](docker-compose.yml) file and place it next to `client`.
 - 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).
@@ -429,10 +429,23 @@ at once. For that:
     - 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
+- The directory structure should now be:
+```
+  your-client-directory/
+  ├── docker-compose.yml
+  ├── .env
+  └── client/
+      ├── legouniverse.exe
+      ├── client/
+      │   ├── res/
+      │   └── locale/
+      ├── versions/
+      └── patcher/
+```
 - Open a terminal in the folder with the `docker-compose.yml` and `client`
 - Run `docker compose up -d`
   - This might require `sudo` on Linux, and a recent version of [docker compose](https://docs.docker.com/compose/install/)
-- Run `docker exec -it dlu-darkflameserver-1 /app/MasterServer -a` and follow the instructions to create the initial admin account
+- Run `docker exec -it darkflameserver /app/MasterServer -a` and follow the instructions to create the initial admin account
 - Open <http://localhost:8000> to access Nexus Dashboard with the admin account to create normal users
 - Set `AUTHSERVERIP=0:localhost` in `client/boot.cfg`
   - Replace `localhost` with the value of `EXTERNAL_IP` if you changed that earlier.

dCommon/CMakeLists.txt

@@ -49,11 +49,10 @@ if (UNIX)
 elseif (WIN32)
 	include(FetchContent)
 
-	# TODO Keep an eye on the zlib repository for an update to disable testing.  Don't forget to update CMakePresets
 	FetchContent_Declare(
 		zlib
-		URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
-		URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
+		URL https://github.com/madler/zlib/archive/refs/tags/v1.3.2.zip
+		URL_HASH MD5=adbba6eef8960c3412818b2e241f46dc
 		GIT_PROGRESS TRUE
 		GIT_SHALLOW 1
 	)
@@ -62,12 +61,12 @@ elseif (WIN32)
 	set(CMAKE_POLICY_DEFAULT_CMP0048 NEW)
 	# Disable warning about the minimum version of cmake used for bcrypt being deprecated in the future
 	set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
+	# Disable zlib tests
+	set(ZLIB_BUILD_TESTING OFF CACHE BOOL "" FORCE)
 
 	FetchContent_MakeAvailable(zlib)
 
 	set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
-	set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-	add_library(ZLIB::ZLIB ALIAS zlib)
 else ()
 	message(
 		FATAL_ERROR