Merge branch 'fix-windows-debug' of https://github.com/DarkflameUniverse/DarkflameServer into fix-windows-debug

use a name for the config
apple pls
2025-12-16 20:24:39 -06:00 · 2024-10-28 00:31:01 -07:00 · 2024-10-28 00:30:49 -07:00 · 2024-10-28 00:16:39 -07:00 · 2024-10-27 20:07:00 -07:00 · 2024-10-27 11:10:17 -07:00
74 changed files with 1280 additions and 369 deletions
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -8,12 +8,13 @@ on:

 jobs:
  build-and-test:
-    name: Build & Test (${{ matrix.os }})
+    name: Build & Test (${{ matrix.os }} - ${{ matrix.cfg }})
    runs-on: ${{ matrix.os }}
    continue-on-error: true
    strategy:
      matrix:
        os: [ windows-2022, ubuntu-22.04, macos-13 ]
+        cfg: [ debug, release ]

    steps:
    - uses: actions/checkout@v3
@@ -33,9 +34,9 @@ jobs:
    - name: cmake
      uses: lukka/run-cmake@v10
      with:
-        configurePreset: "ci-${{matrix.os}}"
-        buildPreset: "ci-${{matrix.os}}"
-        testPreset: "ci-${{matrix.os}}"
+        configurePreset: "ci-${{matrix.os}}-${{matrix.cfg}}"
+        buildPreset: "ci-${{matrix.os}}-${{matrix.cfg}}"
+        testPreset: "ci-${{matrix.os}}-${{matrix.cfg}}"
    - name: artifacts
      uses: actions/upload-artifact@v3
      with:
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,128 +1,242 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
-      "major": 3,
-      "minor": 14,
-      "patch": 0
-    },
-    "configurePresets": [
-      {
-        "name": "default",
-        "displayName": "Default configure step",
-        "description": "Use 'build' dir and Unix makefiles",
-        "binaryDir": "${sourceDir}/build",
-        "generator": "Unix Makefiles"
-      },
-      {
-        "name": "ci-ubuntu-22.04",
-        "displayName": "CI configure step for Ubuntu",
-        "description": "Same as default, Used in GitHub actions workflow",
-        "inherits": "default"
-      },
-      {
-        "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": "windows-default",
-        "inherits": "ci-windows-2022",
-        "displayName": "Windows only Configure Settings",
-        "description": "Sets build and install directories",
-        "generator": "Ninja",
-        "architecture": {
-          "value": "x64",
-          "strategy": "external"
-        }
-      }
-    ],
-    "buildPresets": [
-      {
-        "name": "default",
-        "configurePreset": "default",
-        "displayName": "Default Build",
-        "description": "Default Build",
-        "jobs": 2
-      },
-      {
-        "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": "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": "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": "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
+	"version": 3,
+	"cmakeMinimumRequired": {
+		"major": 3,
+		"minor": 14,
+		"patch": 0
+	},
+	"configurePresets": [
+		{
+			"name": "default",
+			"displayName": "Default configure step",
+			"description": "Use 'build' dir and Unix makefiles",
+			"binaryDir": "${sourceDir}/build",
+			"generator": "Unix Makefiles"
 		},
-        "output": {
-          "outputOnFailure": 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
+		{
+			"name": "ci-debug",
+			"displayName": "CI configure step for Debug",
+			"inherits": "default",
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "Debug"
+			}
 		},
-        "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
+		{
+			"name": "ci-release",
+			"displayName": "CI configure step for Release",
+			"inherits": "default",
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+			}
 		},
-        "output": {
-          "outputOnFailure": true
-        },
-		"filter": {
-			"exclude": {
-				"name": "((example)|(minigzip))+"
+		{
+			"name": "ci-ubuntu-22.04-release",
+			"displayName": "CI configure step for Ubuntu",
+			"description": "Same as default, Used in GitHub actions workflow",
+			"inherits": "ci-release"
+		},
+		{
+			"name": "ci-ubuntu-22.04-debug",
+			"displayName": "CI configure step for Ubuntu",
+			"description": "Same as default, Used in GitHub actions workflow",
+			"inherits": "ci-debug"
+		},
+		{
+			"name": "ci-macos-13-release",
+			"displayName": "CI configure step for MacOS",
+			"description": "Same as default, Used in GitHub actions workflow",
+			"inherits": "ci-release"
+		},
+		{
+			"name": "ci-macos-13-debug",
+			"displayName": "CI configure step for MacOS",
+			"description": "Same as default, Used in GitHub actions workflow",
+			"inherits": "ci-debug"
+		},
+		{
+			"name": "ci-windows-2022-release",
+			"displayName": "CI configure step for Windows",
+			"description": "Set architecture to 64-bit (b/c RakNet)",
+			"inherits": "ci-release",
+			"generator": "Visual Studio 17 2022",
+			"architecture": {
+				"value": "x64"
+			}
+		},
+		{
+			"name": "ci-windows-2022-debug",
+			"displayName": "CI configure step for Windows",
+			"description": "Set architecture to 64-bit (b/c RakNet)",
+			"inherits": "ci-debug",
+			"generator": "Visual Studio 17 2022",
+			"architecture": {
+				"value": "x64"
+			}
+		},
+		{
+			"name": "windows-default-release",
+			"inherits": "ci-windows-2022-release",
+			"displayName": "Windows only Configure Settings (Release)",
+			"description": "Sets build and install directories",
+			"generator": "Ninja",
+			"architecture": {
+				"value": "x64",
+				"strategy": "external"
+			}
+		},
+		{
+			"name": "windows-default-debug",
+			"inherits": "ci-windows-2022-debug",
+			"displayName": "Windows only Configure Settings (Debug)",
+			"description": "Sets build and install directories",
+			"generator": "Ninja",
+			"architecture": {
+				"value": "x64",
+				"strategy": "external"
 			}
 		}
-      }
-    ]
-  }
+	],
+	"buildPresets": [
+		{
+			"name": "default",
+			"configurePreset": "default",
+			"displayName": "Default Build",
+			"description": "Default Build",
+			"jobs": 2
+		},
+		{
+			"name": "ci-windows-2022-debug",
+			"configurePreset": "ci-windows-2022-debug",
+			"displayName": "Windows CI Build",
+			"description": "This preset is used by the CI build on windows",
+			"configuration": "RelWithDebInfo",
+			"inherits": "default"
+		},
+		{
+			"name": "ci-windows-2022-release",
+			"configurePreset": "ci-windows-2022-release",
+			"displayName": "Windows CI Build",
+			"description": "This preset is used by the CI build on windows",
+			"configuration": "RelWithDebInfo",
+			"inherits": "default"
+		},
+		{
+			"name": "ci-ubuntu-22.04-debug",
+			"configurePreset": "ci-ubuntu-22.04-debug",
+			"displayName": "Linux CI Build",
+			"description": "This preset is used by the CI build on linux",
+			"inherits": "default"
+		},
+		{
+			"name": "ci-ubuntu-22.04-release",
+			"configurePreset": "ci-ubuntu-22.04-release",
+			"displayName": "Linux CI Build",
+			"description": "This preset is used by the CI build on linux",
+			"inherits": "default"
+		},
+		{
+			"name": "ci-macos-13-debug",
+			"configurePreset": "ci-macos-13-debug",
+			"displayName": "MacOS CI Build",
+			"description": "This preset is used by the CI build on MacOS",
+			"inherits": "default"
+		},
+		{
+			"name": "ci-macos-13-release",
+			"configurePreset": "ci-macos-13-release",
+			"displayName": "MacOS CI Build",
+			"description": "This preset is used by the CI build on MacOS",
+			"inherits": "default"
+		}
+	],
+	"testPresets": [
+		{
+			"name": "ci-ubuntu-22.04-debug",
+			"configurePreset": "ci-ubuntu-22.04-debug",
+			"displayName": "CI Tests on Linux",
+			"description": "Runs all tests on a linux configuration",
+			"configuration": "Debug",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			}
+		},
+		{
+			"name": "ci-ubuntu-22.04-release",
+			"configurePreset": "ci-ubuntu-22.04-release",
+			"displayName": "CI Tests on Linux",
+			"description": "Runs all tests on a linux configuration",
+			"configuration": "RelWithDebInfo",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			}
+		},
+		{
+			"name": "ci-macos-13-debug",
+			"configurePreset": "ci-macos-13-debug",
+			"displayName": "CI Tests on MacOS",
+			"description": "Runs all tests on a Mac configuration",
+			"configuration": "Debug",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			}
+		},
+		{
+			"name": "ci-macos-13-release",
+			"configurePreset": "ci-macos-13-release",
+			"displayName": "CI Tests on MacOS",
+			"description": "Runs all tests on a Mac configuration",
+			"configuration": "RelWithDebInfo",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			}
+		},
+		{
+			"name": "ci-windows-2022-release",
+			"configurePreset": "ci-windows-2022-release",
+			"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": "ci-windows-2022-debug",
+			"configurePreset": "ci-windows-2022-debug",
+			"displayName": "CI Tests on windows",
+			"description": "Runs all tests on a windows configuration for debug",
+			"configuration": "Debug",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			},
+			"filter": {
+				"exclude": {
+					"name": "((example)|(minigzip))+"
+				}
+			}
+		}
+	]
+}
--- a/4
+++ b/4
@@ -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
--- a/cmake/Utils.cmake
+++ b/cmake/Utils.cmake
@@ -49,3 +49,12 @@ function(UpdateConfigOption file_name old_option_name new_option_name)
 		file(APPEND ${file_name} "\n" ${current_value})
 	endif()
 endfunction()
+
+function(DoAppleMariaDBCopy target location)
+if(APPLE)
+	add_custom_command(TARGET ${target} POST_BUILD
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different
+		${MARIADBCPP_SHARED_LIBRARY_LOCATION}
+		${location})
+	endif()
+endfunction()
--- a/dChatServer/ChatServer.cpp
+++ b/dChatServer/ChatServer.cpp
@@ -179,6 +179,7 @@ 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) {
--- a/dChatServer/PlayerContainer.cpp
+++ b/dChatServer/PlayerContainer.cpp
@@ -36,16 +36,19 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 	data.playerID = playerId;

 	uint32_t len;
-	inStream.Read<uint32_t>(len);
+	if (!inStream.Read<uint32_t>(len)) return;

-	for (int i = 0; i < len; i++) {
-		char character; inStream.Read<char>(character);
-		data.playerName += character;
+	if (len > 33) {
+		LOG("Received a really long player name, probably a fake packet %i.", len);
+		return;
 	}

-	inStream.Read(data.zoneID);
-	inStream.Read(data.muteExpire);
-	inStream.Read(data.gmLevel);
+	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;
 	data.sysAddr = packet->systemAddress;

 	m_Names[data.playerID] = GeneralUtils::UTF8ToUTF16(data.playerName);
@@ -122,6 +125,11 @@ 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);
--- a/dCommon/Diagnostics.cpp
+++ b/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;
--- a/dCommon/dConfig.cpp
+++ b/dCommon/dConfig.cpp
@@ -1,6 +1,7 @@
 #include "dConfig.h"

 #include <sstream>
+#include <algorithm>

 #include "BinaryPathFinder.h"
 #include "GeneralUtils.h"
--- a/dCommon/dEnums/eInventoryType.h
+++ b/dCommon/dEnums/eInventoryType.h
@@ -4,6 +4,9 @@
 #define __EINVENTORYTYPE__H__

 #include <cstdint>
+
+#include "magic_enum.hpp"
+
 static const uint8_t NUMBER_OF_INVENTORIES = 17;
 /**
 * Represents the different types of inventories an entity may have
@@ -56,4 +59,10 @@ public:
 	};
 };

+template <>
+struct magic_enum::customize::enum_range<eInventoryType> {
+	static constexpr int min = 0;
+	static constexpr int max = 16;
+};
+
 #endif  //!__EINVENTORYTYPE__H__
--- a/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h
+++ b/dCommon/dEnums/eReponseMoveItemBetweenInventoryTypeCode.h
@@ -0,0 +1,21 @@
+#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__
--- a/dDatabase/GameDatabase/GameDatabase.h
+++ b/dDatabase/GameDatabase/GameDatabase.h
@@ -23,6 +23,7 @@
 #include "IActivityLog.h"
 #include "IIgnoreList.h"
 #include "IAccountsRewardCodes.h"
+#include "IBehaviors.h"

 namespace sql {
 	class Statement;
@@ -40,7 +41,8 @@ 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 IAccounts, public IActivityLog, public IAccountsRewardCodes, public IIgnoreList,
+	public IBehaviors {
 public:
 	virtual ~GameDatabase() = default;
 	// TODO: These should be made private.
--- a/dDatabase/GameDatabase/ITables/IAccounts.h
+++ b/dDatabase/GameDatabase/ITables/IAccounts.h
@@ -33,6 +33,9 @@ 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__
--- a/dDatabase/GameDatabase/ITables/IBehaviors.h
+++ b/dDatabase/GameDatabase/ITables/IBehaviors.h
@@ -0,0 +1,22 @@
+#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
--- a/dDatabase/GameDatabase/ITables/IPropertyContents.h
+++ b/dDatabase/GameDatabase/ITables/IPropertyContents.h
@@ -1,6 +1,7 @@
 #ifndef __IPROPERTIESCONTENTS__H__
 #define __IPROPERTIESCONTENTS__H__

+#include <array>
 #include <cstdint>
 #include <string_view>

@@ -16,6 +17,7 @@ public:
 		LWOOBJID id{};
 		LOT lot{};
 		uint32_t ugcId{};
+		std::array<int32_t, 5> behaviors{};
 	};

 	// Inserts a new UGC model into the database.
@@ -32,7 +34,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 UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) = 0;
+	virtual void UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) = 0;

 	// Remove the model for the given property id.
 	virtual void RemoveModel(const LWOOBJID& modelId) = 0;
--- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
+++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
@@ -74,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 UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) 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;
@@ -108,6 +108,10 @@ 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;
 private:

 	// Generic query functions that can be used for any query.
--- a/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
@@ -35,3 +35,7 @@ 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);
+}
--- a/dDatabase/GameDatabase/MySQL/Tables/Behaviors.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Behaviors.cpp
@@ -0,0 +1,19 @@
+#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() : "";
+}
--- a/dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt
+++ b/dDatabase/GameDatabase/MySQL/Tables/CMakeLists.txt
@@ -2,6 +2,7 @@ set(DDATABASES_DATABASES_MYSQL_TABLES_SOURCES
 	"Accounts.cpp"
 	"AccountsRewardCodes.cpp"
 	"ActivityLog.cpp"
+	"Behaviors.cpp"
 	"BugReports.cpp"
 	"CharInfo.cpp"
 	"CharXml.cpp"
--- a/dDatabase/GameDatabase/MySQL/Tables/PropertyContents.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/PropertyContents.cpp
@@ -1,7 +1,10 @@
 #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 FROM properties_contents WHERE property_id = ?;", 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);

 	std::vector<IPropertyContents::Model> toReturn;
 	toReturn.reserve(result->rowsCount());
@@ -17,6 +20,12 @@ 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;
@@ -32,21 +41,23 @@ 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.
-			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.
+			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
 		);
 	} catch (sql::SQLException& e) {
 		LOG("Error inserting new property model: %s", e.what());
 	}
 }

-void MySQLDatabase::UpdateModelPositionRotation(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation) {
+void MySQLDatabase::UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) {
 	ExecuteUpdate(
-		"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);
+		"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);
 }

 void MySQLDatabase::RemoveModel(const LWOOBJID& modelId) {
--- a/dGame/Character.cpp
+++ b/dGame/Character.cpp
@@ -27,6 +27,8 @@ 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() {
--- a/dGame/Character.h
+++ b/dGame/Character.h
@@ -464,22 +464,22 @@ private:
 	/**
 	 * 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 m_ObjectID{ LWOOBJID_EMPTY };

 	/**
 	 * 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.
@@ -506,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
@@ -583,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
@@ -613,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)
--- a/dGame/Entity.cpp
+++ b/dGame/Entity.cpp
@@ -225,7 +225,7 @@ void Entity::Initialize() {

 		AddComponent<SimplePhysicsComponent>(simplePhysicsComponentID);

-		AddComponent<ModelComponent>();
+		AddComponent<ModelComponent>()->LoadBehaviors();

 		AddComponent<RenderComponent>();

@@ -649,7 +649,7 @@ void Entity::Initialize() {
 	}

 	if (compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MODEL, -1) != -1 && !GetComponent<PetComponent>()) {
-		AddComponent<ModelComponent>();
+		AddComponent<ModelComponent>()->LoadBehaviors();
 		if (!HasComponent(eReplicaComponentType::DESTROYABLE)) {
 			auto* destroyableComponent = AddComponent<DestroyableComponent>();
 			destroyableComponent->SetHealth(1);
--- a/dGame/User.cpp
+++ b/dGame/User.cpp
@@ -12,6 +12,7 @@ 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;
--- a/dGame/dBehaviors/BehaviorContext.cpp
+++ b/dGame/dBehaviors/BehaviorContext.cpp
@@ -105,7 +105,7 @@ void BehaviorContext::ExecuteUpdates() {
 	this->scheduledUpdates.clear();
 }

-void BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bitStream) {
+bool BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bitStream) {
 	BehaviorSyncEntry entry;
 	auto found = false;

@@ -128,7 +128,7 @@ void BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bit
 	if (!found) {
 		LOG("Failed to find behavior sync entry with sync id (%i)!", syncId);

-		return;
+		return false;
 	}

 	auto* behavior = entry.behavior;
@@ -137,10 +137,11 @@ void BehaviorContext::SyncBehavior(const uint32_t syncId, RakNet::BitStream& bit
 	if (behavior == nullptr) {
 		LOG("Invalid behavior for sync id (%i)!", syncId);

-		return;
+		return false;
 	}

 	behavior->Sync(this, bitStream, branch);
+	return true;
 }


@@ -198,6 +199,26 @@ 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, eClientMessageType::GAME_MSG);
+			message.Write(this->originator);
+			echo.Serialize(message);
+
+			Game::server->Send(message, UNASSIGNED_SYSTEM_ADDRESS, true);
+		}
+
 		this->syncEntries.erase(this->syncEntries.begin() + i);
 	}
 }
--- a/dGame/dBehaviors/BehaviorContext.h
+++ b/dGame/dBehaviors/BehaviorContext.h
@@ -93,7 +93,7 @@ struct BehaviorContext

 	void ExecuteUpdates();

-	void SyncBehavior(uint32_t syncId, RakNet::BitStream& bitStream);
+	bool SyncBehavior(uint32_t syncId, RakNet::BitStream& bitStream);

 	void Update(float deltaTime);

--- a/dGame/dBehaviors/DamageAbsorptionBehavior.cpp
+++ b/dGame/dBehaviors/DamageAbsorptionBehavior.cpp
@@ -27,6 +27,8 @@ 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) {
@@ -52,7 +54,13 @@ void DamageAbsorptionBehavior::Timer(BehaviorContext* context, BehaviorBranchCon

 	const auto toRemove = std::min(present, this->m_absorbAmount);

-	destroyable->SetDamageToAbsorb(present - toRemove);
+	const auto remaining = present - toRemove;
+
+	destroyable->SetDamageToAbsorb(remaining);
+
+	destroyable->SetIsShielded(remaining > 0);
+
+	Game::entityManager->SerializeEntity(target);
 }

 void DamageAbsorptionBehavior::Load() {
--- a/dGame/dComponents/BaseCombatAIComponent.cpp
+++ b/dGame/dComponents/BaseCombatAIComponent.cpp
@@ -29,7 +29,8 @@

 BaseCombatAIComponent::BaseCombatAIComponent(Entity* parent, const uint32_t id): Component(parent) {
 	m_Target = LWOOBJID_EMPTY;
-	SetAiState(AiState::spawn);
+	m_DirtyStateOrTarget = true;
+	m_State = AiState::spawn;
 	m_Timer = 1.0f;
 	m_StartPosition = parent->GetPosition();
 	m_MovementAI = nullptr;
--- a/dGame/dComponents/InventoryComponent.cpp
+++ b/dGame/dComponents/InventoryComponent.cpp
@@ -37,6 +37,9 @@
 #include "CDScriptComponentTable.h"
 #include "CDObjectSkillsTable.h"
 #include "CDSkillBehaviorTable.h"
+#include "StringifiedEnum.h"
+
+#include <ranges>

 InventoryComponent::InventoryComponent(Entity* parent) : Component(parent) {
 	this->m_Dirty = true;
@@ -492,6 +495,11 @@ void InventoryComponent::LoadXml(const tinyxml2::XMLDocument& document) {
 		return;
 	}

+	auto* const groups = inventoryElement->FirstChildElement("grps");
+	if (groups) {
+		LoadGroupXml(*groups);
+	}
+
 	m_Consumable = inventoryElement->IntAttribute("csl", LOT_NULL);

 	auto* bag = bags->FirstChildElement();
@@ -630,6 +638,15 @@ void InventoryComponent::UpdateXml(tinyxml2::XMLDocument& document) {
 		bags->LinkEndChild(bag);
 	}

+	auto* groups = inventoryElement->FirstChildElement("grps");
+	if (groups) {
+		groups->DeleteChildren();
+	} else {
+		groups = inventoryElement->InsertNewChildElement("grps");
+	}
+
+	UpdateGroupXml(*groups);
+
 	auto* items = inventoryElement->FirstChildElement("items");

 	if (items == nullptr) {
@@ -875,8 +892,6 @@ void InventoryComponent::UnEquipItem(Item* item) {

 	RemoveSlot(item->GetInfo().equipLocation);

-	PurgeProxies(item);
-
 	UnequipScripts(item);

 	Game::entityManager->SerializeEntity(m_Parent);
@@ -886,6 +901,8 @@ void InventoryComponent::UnEquipItem(Item* item) {
 		PropertyManagementComponent::Instance()->GetParent()->OnZonePropertyModelRemovedWhileEquipped(m_Parent);
 		Game::zoneManager->GetZoneControlObject()->OnZonePropertyModelRemovedWhileEquipped(m_Parent);
 	}
+
+	PurgeProxies(item);
 }


@@ -1505,10 +1522,10 @@ void InventoryComponent::PurgeProxies(Item* item) {
 	const auto root = item->GetParent();

 	if (root != LWOOBJID_EMPTY) {
-		item = FindItemById(root);
+		Item* itemRoot = FindItemById(root);

-		if (item != nullptr) {
-			UnEquipItem(item);
+		if (itemRoot != nullptr) {
+			UnEquipItem(itemRoot);
 		}

 		return;
@@ -1603,3 +1620,110 @@ bool InventoryComponent::SetSkill(BehaviorSlot slot, uint32_t skillId) {
 	m_Skills.insert_or_assign(slot, skillId);
 	return true;
 }
+
+void InventoryComponent::UpdateGroup(const GroupUpdate& groupUpdate) {
+	if (groupUpdate.groupId.empty()) return;
+
+	if (groupUpdate.inventory != eInventoryType::BRICKS && groupUpdate.inventory != eInventoryType::MODELS) {
+		LOG("Invalid inventory type for grouping %s", StringifiedEnum::ToString(groupUpdate.inventory).data());
+		return;
+	}
+
+	auto& groups = m_Groups[groupUpdate.inventory];
+	auto groupItr = std::ranges::find_if(groups, [&groupUpdate](const Group& group) {
+		return group.groupId == groupUpdate.groupId;
+		});
+
+	if (groupUpdate.command != GroupUpdateCommand::ADD && groupItr == groups.end()) {
+		LOG("Group %s not found in inventory %s. Cannot process command.", groupUpdate.groupId.c_str(), StringifiedEnum::ToString(groupUpdate.inventory).data());
+		return;
+	}
+
+	if (groupUpdate.command == GroupUpdateCommand::ADD && groups.size() >= MaximumGroupCount) {
+		LOG("Cannot add group to inventory %s. Maximum group count reached.", StringifiedEnum::ToString(groupUpdate.inventory).data());
+		return;
+	}
+
+	switch (groupUpdate.command) {
+	case GroupUpdateCommand::ADD: {
+		auto& group = groups.emplace_back();
+		group.groupId = groupUpdate.groupId;
+		group.groupName = groupUpdate.groupName;
+		break;
+	}
+	case GroupUpdateCommand::ADD_LOT: {
+		groupItr->lots.insert(groupUpdate.lot);
+		break;
+	}
+	case GroupUpdateCommand::REMOVE: {
+		groups.erase(groupItr);
+		break;
+	}
+	case GroupUpdateCommand::REMOVE_LOT: {
+		groupItr->lots.erase(groupUpdate.lot);
+		break;
+	}
+	case GroupUpdateCommand::MODIFY: {
+		groupItr->groupName = groupUpdate.groupName;
+		break;
+	}
+	default: {
+		LOG("Invalid group update command %i", groupUpdate.command);
+		break;
+	}
+	}
+}
+
+void InventoryComponent::UpdateGroupXml(tinyxml2::XMLElement& groups) const {
+	for (const auto& [inventory, groupsData] : m_Groups) {
+		for (const auto& group : groupsData) {
+			auto* const groupElement = groups.InsertNewChildElement("grp");
+
+			groupElement->SetAttribute("id", group.groupId.c_str());
+			groupElement->SetAttribute("n", group.groupName.c_str());
+			groupElement->SetAttribute("t", static_cast<uint32_t>(inventory));
+			groupElement->SetAttribute("u", 0);
+			std::ostringstream lots;
+			bool first = true;
+			for (const auto lot : group.lots) {
+				if (!first) lots << ' ';
+				first = false;
+
+				lots << lot;
+			}
+			groupElement->SetAttribute("l", lots.str().c_str());
+		}
+	}
+}
+
+void InventoryComponent::LoadGroupXml(const tinyxml2::XMLElement& groups) {
+	auto* groupElement = groups.FirstChildElement("grp");
+
+	while (groupElement) {
+		const char* groupId = nullptr;
+		const char* groupName = nullptr;
+		const char* lots = nullptr;
+		uint32_t inventory = eInventoryType::INVALID;
+
+		groupElement->QueryStringAttribute("id", &groupId);
+		groupElement->QueryStringAttribute("n", &groupName);
+		groupElement->QueryStringAttribute("l", &lots);
+		groupElement->QueryAttribute("t", &inventory);
+
+		if (!groupId || !groupName || !lots) {
+			LOG("Failed to load group from xml id %i name %i lots %i",
+				groupId == nullptr, groupName == nullptr, lots == nullptr);
+		} else {
+			auto& group = m_Groups[static_cast<eInventoryType>(inventory)].emplace_back();
+			group.groupId = groupId;
+			group.groupName = groupName;
+
+			for (const auto& lotStr : GeneralUtils::SplitString(lots, ' ')) {
+				auto lot = GeneralUtils::TryParse<LOT>(lotStr);
+				if (lot) group.lots.insert(*lot);
+			}
+		}
+
+		groupElement = groupElement->NextSiblingElement("grp");
+	}
+}
--- a/dGame/dComponents/InventoryComponent.h
+++ b/dGame/dComponents/InventoryComponent.h
@@ -37,6 +37,35 @@ enum class eItemType : int32_t;
 */
 class InventoryComponent final : public Component {
 public:
+	struct Group {
+		// Generated ID for the group. The ID is sent by the client and has the format user_group + Math.random() * UINT_MAX.
+		std::string groupId;
+		// Custom name assigned by the user.
+		std::string groupName;
+		// All the lots the user has in the group.
+		std::set<LOT> lots;
+	};
+
+	enum class GroupUpdateCommand {
+		ADD,
+		ADD_LOT,
+		MODIFY,
+		REMOVE,
+		REMOVE_LOT,
+	};
+
+	// Based on the command, certain fields will be used or not used.
+	// for example, ADD_LOT wont use groupName, MODIFY wont use lots, etc.
+	struct GroupUpdate {
+		std::string groupId;
+		std::string groupName;
+		LOT lot;
+		eInventoryType inventory;
+		GroupUpdateCommand command;
+	};
+
+	static constexpr uint32_t MaximumGroupCount = 50;
+
 	static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::INVENTORY;
 	InventoryComponent(Entity* parent);

@@ -367,14 +396,23 @@ public:
 	 */
 	void UnequipScripts(Item* unequippedItem);

-	std::map<BehaviorSlot, uint32_t> GetSkills(){ return m_Skills; };
+	std::map<BehaviorSlot, uint32_t> GetSkills() { return m_Skills; };

 	bool SetSkill(int slot, uint32_t skillId);
 	bool SetSkill(BehaviorSlot slot, uint32_t skillId);

+	void UpdateGroup(const GroupUpdate& groupUpdate);
+	void RemoveGroup(const std::string& groupId);
+
 	~InventoryComponent() override;

 private:
+	/**
+	 * The key is the inventory the group belongs to, the value maps' key is the id for the group.
+	 * This is only used for bricks and model inventories.
+	 */
+	std::map<eInventoryType, std::vector<Group>> m_Groups{ { eInventoryType::BRICKS, {} }, { eInventoryType::MODELS, {} } };
+
 	/**
 	 * All the inventory this entity possesses
 	 */
@@ -477,6 +515,9 @@ private:
 	 * @param document the xml doc to load from
 	 */
 	void UpdatePetXml(tinyxml2::XMLDocument& document);
+
+	void LoadGroupXml(const tinyxml2::XMLElement& groups);
+	void UpdateGroupXml(tinyxml2::XMLElement& groups) const;
 };

 #endif
--- a/dGame/dComponents/ModelComponent.cpp
+++ b/dGame/dComponents/ModelComponent.cpp
@@ -6,6 +6,9 @@

 #include "BehaviorStates.h"
 #include "ControlBehaviorMsgs.h"
+#include "tinyxml2.h"
+
+#include "Database.h"

 ModelComponent::ModelComponent(Entity* parent) : Component(parent) {
 	m_OriginalPosition = m_Parent->GetDefaultPosition();
@@ -14,6 +17,33 @@ ModelComponent::ModelComponent(Entity* parent) : Component(parent) {
 	m_userModelID = m_Parent->GetVarAs<LWOOBJID>(u"userModelID");
 }

+void ModelComponent::LoadBehaviors() {
+	auto behaviors = GeneralUtils::SplitString(m_Parent->GetVar<std::string>(u"userModelBehaviors"), ',');
+	for (const auto& behavior : behaviors) {
+		if (behavior.empty()) continue;
+
+		const auto behaviorId = GeneralUtils::TryParse<int32_t>(behavior);
+		if (!behaviorId.has_value() || behaviorId.value() == 0) continue;
+
+		LOG_DEBUG("Loading behavior %d", behaviorId.value());
+		auto& inserted = m_Behaviors.emplace_back();
+		inserted.SetBehaviorId(*behaviorId);
+		
+		const auto behaviorStr = Database::Get()->GetBehavior(behaviorId.value());
+		
+		tinyxml2::XMLDocument behaviorXml;
+		auto res = behaviorXml.Parse(behaviorStr.c_str(), behaviorStr.size());
+		LOG_DEBUG("Behavior %i %d: %s", res, behaviorId.value(), behaviorStr.c_str());
+
+		const auto* const behaviorRoot = behaviorXml.FirstChildElement("Behavior");
+		if (!behaviorRoot) {
+			LOG("Failed to load behavior %d due to missing behavior root", behaviorId.value());
+			continue;
+		}
+		inserted.Deserialize(*behaviorRoot);
+	}
+}
+
 void ModelComponent::Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) {
 	// ItemComponent Serialization.  Pets do not get this serialization.
 	if (!m_Parent->HasComponent(eReplicaComponentType::PET)) {
@@ -72,3 +102,23 @@ void ModelComponent::MoveToInventory(MoveToInventoryMessage& msg) {
 	m_Behaviors.erase(m_Behaviors.begin() + msg.GetBehaviorIndex());
 	// TODO move to the inventory
 }
+
+std::array<std::pair<int32_t, std::string>, 5> ModelComponent::GetBehaviorsForSave() const {
+	std::array<std::pair<int32_t, std::string>, 5> toReturn{};
+	for (auto i = 0; i < m_Behaviors.size(); i++) {
+		const auto& behavior = m_Behaviors.at(i);
+		if (behavior.GetBehaviorId() == -1) continue;
+		auto& [id, behaviorData] = toReturn[i];
+		id = behavior.GetBehaviorId();
+
+		tinyxml2::XMLDocument doc;
+		auto* root = doc.NewElement("Behavior");
+		behavior.Serialize(*root);
+		doc.InsertFirstChild(root);
+
+		tinyxml2::XMLPrinter printer(0, true, 0);
+		doc.Print(&printer);
+		behaviorData = printer.CStr();
+	}
+	return toReturn;
+}
--- a/dGame/dComponents/ModelComponent.h
+++ b/dGame/dComponents/ModelComponent.h
@@ -1,5 +1,6 @@
 #pragma once

+#include <array>
 #include <map>

 #include "dCommonVars.h"
@@ -28,6 +29,8 @@ public:

 	ModelComponent(Entity* parent);

+	void LoadBehaviors();
+
 	void Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) override;

 	/**
@@ -109,6 +112,8 @@ public:
 	
 	void VerifyBehaviors();

+	std::array<std::pair<int32_t, std::string>, 5> GetBehaviorsForSave() const;
+
 private:
 	/**
 	 * The behaviors of the model
--- a/dGame/dComponents/PropertyManagementComponent.cpp
+++ b/dGame/dComponents/PropertyManagementComponent.cpp
@@ -21,9 +21,11 @@
 #include "eObjectBits.h"
 #include "CharacterComponent.h"
 #include "PlayerManager.h"
+#include "ModelComponent.h"

 #include <vector>
 #include "CppScripts.h"
+#include <ranges>

 PropertyManagementComponent* PropertyManagementComponent::instance = nullptr;

@@ -593,6 +595,20 @@ void PropertyManagementComponent::Load() {
 			settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
 		}

+		std::ostringstream userModelBehavior;
+		bool firstAdded = false;
+		for (auto behavior : databaseModel.behaviors) {
+			if (behavior < 0) {
+				LOG("Invalid behavior ID: %d, removing behavior reference from model", behavior);
+				behavior = 0;
+			}
+			if (firstAdded) userModelBehavior << ",";
+			userModelBehavior << behavior;
+			firstAdded = true;
+		}
+
+		settings.push_back(new LDFData<std::string>(u"userModelBehaviors", userModelBehavior.str()));
+
 		node->config = settings;

 		const auto spawnerId = Game::zoneManager->MakeSpawner(info);
@@ -610,6 +626,12 @@ void PropertyManagementComponent::Save() {
 		return;
 	}

+	const auto* const owner = GetOwner();
+	if (!owner) return;
+
+	const auto* const character = owner->GetCharacter();
+	if (!character) return;
+
 	auto present = Database::Get()->GetPropertyModels(propertyId);

 	std::vector<LWOOBJID> modelIds;
@@ -624,6 +646,20 @@ void PropertyManagementComponent::Save() {
 		if (entity == nullptr) {
 			continue;
 		}
+		auto* modelComponent = entity->GetComponent<ModelComponent>();
+		if (!modelComponent) continue;
+		const auto modelBehaviors = modelComponent->GetBehaviorsForSave();
+
+		// save the behaviors of the model
+		for (const auto& [behaviorId, behaviorStr] : modelBehaviors) {
+			if (behaviorStr.empty() || behaviorId == -1 || behaviorId == 0) continue;
+			IBehaviors::Info info {
+				.behaviorId = behaviorId,
+				.characterId = character->GetID(),
+				.behaviorInfo = behaviorStr
+			};
+			Database::Get()->AddBehavior(info);
+		}

 		const auto position = entity->GetPosition();
 		const auto rotation = entity->GetRotation();
@@ -635,10 +671,13 @@ void PropertyManagementComponent::Save() {
 			model.position = position;
 			model.rotation = rotation;
 			model.ugcId = 0;
+			for (auto i = 0; i < model.behaviors.size(); i++) {
+				model.behaviors[i] = modelBehaviors[i].first;
+			}

 			Database::Get()->InsertNewPropertyModel(propertyId, model, "Objects_" + std::to_string(model.lot) + "_name");
 		} else {
-			Database::Get()->UpdateModelPositionRotation(id, position, rotation);
+			Database::Get()->UpdateModel(id, position, rotation, modelBehaviors);
 		}
 	}

--- a/dGame/dComponents/RacingControlComponent.cpp
+++ b/dGame/dComponents/RacingControlComponent.cpp
@@ -25,6 +25,7 @@
 #include "LeaderboardManager.h"
 #include "dZoneManager.h"
 #include "CDActivitiesTable.h"
+#include "eStateChangeType.h"
 #include <ctime>

 #ifndef M_PI
@@ -44,7 +45,6 @@ RacingControlComponent::RacingControlComponent(Entity* parent)
 	m_LoadedPlayers = 0;
 	m_LoadTimer = 0;
 	m_Finished = 0;
-	m_StartTime = 0;
 	m_EmptyTimer = 0;
 	m_SoloRacing = Game::config->GetValue("solo_racing") == "1";

@@ -77,6 +77,9 @@ void RacingControlComponent::OnPlayerLoaded(Entity* player) {

 	m_LoadedPlayers++;

+	// not live accurate to stun the player but prevents them from using skills during the race that are not meant to be used.
+	GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY, true, true, true, true, true, true, true, true, true);
+
 	LOG("Loading player %i",
 		m_LoadedPlayers);
 	m_LobbyPlayers.push_back(player->GetObjectID());
@@ -394,25 +397,6 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t bu
 		GameMessages::SendNotifyRacingClient(
 			m_Parent->GetObjectID(), 2, 0, LWOOBJID_EMPTY, u"",
 			player->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS);
-
-		auto* missionComponent = player->GetComponent<MissionComponent>();
-
-		if (missionComponent == nullptr) return;
-
-		missionComponent->Progress(eMissionTaskType::RACING, 0, static_cast<LWOOBJID>(eRacingTaskParam::COMPETED_IN_RACE)); // Progress task for competing in a race
-		missionComponent->Progress(eMissionTaskType::RACING, data->smashedTimes, static_cast<LWOOBJID>(eRacingTaskParam::SAFE_DRIVER)); // Finish a race without being smashed.
-
-		// If solo racing is enabled OR if there are 3 players in the race, progress placement tasks.
-		if (m_SoloRacing || m_LoadedPlayers > 2) {
-			missionComponent->Progress(eMissionTaskType::RACING, data->finished, static_cast<LWOOBJID>(eRacingTaskParam::FINISH_WITH_PLACEMENT)); // Finish in 1st place on a race
-			if (data->finished == 1) {
-				missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::FIRST_PLACE_MULTIPLE_TRACKS)); // Finish in 1st place on multiple tracks.
-				missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::WIN_RACE_IN_WORLD)); // Finished first place in specific world.
-			}
-			if (data->finished == m_LoadedPlayers) {
-				missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::LAST_PLACE_FINISH)); // Finished first place in specific world.
-			}
-		}
 	} else if ((id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") && button == m_ActivityExitConfirm) {
 		auto* vehicle = Game::entityManager->GetEntity(data->vehicleID);

@@ -442,9 +426,9 @@ void RacingControlComponent::Serialize(RakNet::BitStream& outBitStream, bool bIs
 		outBitStream.Write(player.playerID);

 		outBitStream.Write(player.data[0]);
-		if (player.finished != 0) outBitStream.Write<float>(player.raceTime);
+		if (player.finished != 0) outBitStream.Write<float>(player.raceTime.count() / 1000.0f);
 		else outBitStream.Write(player.data[1]);
-		if (player.finished != 0) outBitStream.Write<float>(player.bestLapTime);
+		if (player.finished != 0) outBitStream.Write<float>(player.bestLapTime.count() / 1000.0f);
 		else outBitStream.Write(player.data[2]);
 		if (player.finished == 1) outBitStream.Write<float>(1.0f);
 		else outBitStream.Write(player.data[3]);
@@ -505,8 +489,8 @@ void RacingControlComponent::Serialize(RakNet::BitStream& outBitStream, bool bIs
 			if (player.finished == 0) continue;
 			outBitStream.Write1(); // Has more data
 			outBitStream.Write(player.playerID);
-			outBitStream.Write<float>(player.bestLapTime);
-			outBitStream.Write<float>(player.raceTime);
+			outBitStream.Write<float>(player.bestLapTime.count() / 1000.0f);
+			outBitStream.Write<float>(player.raceTime.count() / 1000.0f);
 		}

 		outBitStream.Write0(); // No more data
@@ -736,7 +720,7 @@ void RacingControlComponent::Update(float deltaTime) {

 				Game::entityManager->SerializeEntity(m_Parent);

-				m_StartTime = std::time(nullptr);
+				m_StartTime = std::chrono::high_resolution_clock::now();
 			}

 			m_StartTimer += deltaTime;
@@ -825,46 +809,60 @@ void RacingControlComponent::Update(float deltaTime) {

 			// Reached the start point, lapped
 			if (respawnIndex == 0) {
-				time_t lapTime = std::time(nullptr) - (player.lap == 0 ? m_StartTime : player.lapTime);
+				const auto now = std::chrono::high_resolution_clock::now();
+				const auto lapTime = std::chrono::duration_cast<std::chrono::milliseconds>(now - (player.lap == 0 ? m_StartTime : player.lapTime));

 				// Cheating check
-				if (lapTime < 40) {
+				if (lapTime.count() < 40000) {
 					continue;
 				}

-				player.lap++;
+				player.lapTime = now;

-				player.lapTime = std::time(nullptr);
-
-				if (player.bestLapTime == 0 || player.bestLapTime > lapTime) {
+				if (player.bestLapTime > lapTime || player.lap == 0) {
 					player.bestLapTime = lapTime;

 					LOG("Best lap time (%llu)", lapTime);
 				}

+				player.lap++;
+
 				auto* missionComponent =
 					playerEntity->GetComponent<MissionComponent>();

 				if (missionComponent != nullptr) {

 					// Progress lap time tasks
-					missionComponent->Progress(eMissionTaskType::RACING, (lapTime) * 1000, static_cast<LWOOBJID>(eRacingTaskParam::LAP_TIME));
+					missionComponent->Progress(eMissionTaskType::RACING, lapTime.count(), static_cast<LWOOBJID>(eRacingTaskParam::LAP_TIME));

 					if (player.lap == 3) {
 						m_Finished++;
 						player.finished = m_Finished;

-						const auto raceTime =
-							(std::time(nullptr) - m_StartTime);
+						const auto raceTime = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_StartTime);

 						player.raceTime = raceTime;

-						LOG("Completed time %llu, %llu",
-							raceTime, raceTime * 1000);
+						LOG("Completed time %llums %fs", raceTime.count(), raceTime.count() / 1000.0f);

-						LeaderboardManager::SaveScore(playerEntity->GetObjectID(), m_ActivityID, static_cast<float>(player.raceTime), static_cast<float>(player.bestLapTime), static_cast<float>(player.finished == 1));
+						LeaderboardManager::SaveScore(playerEntity->GetObjectID(), m_ActivityID, static_cast<float>(player.raceTime.count()) / 1000, static_cast<float>(player.bestLapTime.count()) / 1000, static_cast<float>(player.finished == 1));
 						// Entire race time
-						missionComponent->Progress(eMissionTaskType::RACING, (raceTime) * 1000, static_cast<LWOOBJID>(eRacingTaskParam::TOTAL_TRACK_TIME));
+						missionComponent->Progress(eMissionTaskType::RACING, player.raceTime.count(), static_cast<LWOOBJID>(eRacingTaskParam::TOTAL_TRACK_TIME));
+
+						missionComponent->Progress(eMissionTaskType::RACING, 0, static_cast<LWOOBJID>(eRacingTaskParam::COMPETED_IN_RACE)); // Progress task for competing in a race
+						missionComponent->Progress(eMissionTaskType::RACING, player.smashedTimes, static_cast<LWOOBJID>(eRacingTaskParam::SAFE_DRIVER)); // Finish a race without being smashed.
+
+						// If solo racing is enabled OR if there are 3 players in the race, progress placement tasks.
+						if (m_SoloRacing || m_RacingPlayers.size() > 2) {
+							missionComponent->Progress(eMissionTaskType::RACING, player.finished, static_cast<LWOOBJID>(eRacingTaskParam::FINISH_WITH_PLACEMENT)); // Finish in 1st place on a race
+							if (player.finished == 1) {
+								missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::FIRST_PLACE_MULTIPLE_TRACKS)); // Finish in 1st place on multiple tracks.
+								missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::WIN_RACE_IN_WORLD)); // Finished first place in specific world.
+							}
+							if (player.finished == m_RacingPlayers.size()) {
+								missionComponent->Progress(eMissionTaskType::RACING, Game::zoneManager->GetZone()->GetWorldID(), static_cast<LWOOBJID>(eRacingTaskParam::LAST_PLACE_FINISH)); // Finished first place in specific world.
+							}
+						}

 						auto* characterComponent = playerEntity->GetComponent<CharacterComponent>();
 						if (characterComponent != nullptr) {
@@ -873,8 +871,8 @@ void RacingControlComponent::Update(float deltaTime) {
 					}
 				}

-				LOG("Lapped (%i) in (%llu)", player.lap,
-					lapTime);
+				LOG("Lapped (%i) in (%llums %fs)", player.lap,
+					lapTime.count(), lapTime.count() / 1000.0f);
 			}

 			LOG("Reached point (%i)/(%i)", player.respawnIndex,
--- a/dGame/dComponents/RacingControlComponent.h
+++ b/dGame/dComponents/RacingControlComponent.h
@@ -8,6 +8,7 @@
 #include "Entity.h"
 #include "Component.h"
 #include "eReplicaComponentType.h"
+#include <chrono>

 /**
  * Information for each player in the race
@@ -72,12 +73,12 @@ struct RacingPlayerInfo {
 	/**
 	 * The fastest lap time of the player
 	 */
-	time_t bestLapTime = 0;
+	std::chrono::milliseconds bestLapTime;

 	/**
 	 * The current lap time of the player
 	 */
-	time_t lapTime = 0;
+	std::chrono::high_resolution_clock::time_point lapTime;

 	/**
 	 * The number of times this player smashed their car
@@ -97,7 +98,7 @@ struct RacingPlayerInfo {
 	/**
 	 * Unused
 	 */
-	time_t raceTime = 0;
+	std::chrono::milliseconds raceTime;
 };

 /**
@@ -231,7 +232,7 @@ private:
 	/**
 	 * The time the race was started
 	 */
-	time_t m_StartTime;
+	std::chrono::high_resolution_clock::time_point m_StartTime;

 	/**
 	 * Timer for tracking how long a player was alone in this race
--- a/dGame/dComponents/SkillComponent.cpp
+++ b/dGame/dComponents/SkillComponent.cpp
@@ -38,7 +38,7 @@ bool SkillComponent::CastPlayerSkill(const uint32_t behaviorId, const uint32_t s

 	context->skillID = skillID;

-	this->m_managedBehaviors.insert_or_assign(skillUid, context);
+	this->m_managedBehaviors.insert({ skillUid, context });

 	auto* behavior = Behavior::CreateBehavior(behaviorId);

@@ -52,17 +52,24 @@ bool SkillComponent::CastPlayerSkill(const uint32_t behaviorId, const uint32_t s
 }

 void SkillComponent::SyncPlayerSkill(const uint32_t skillUid, const uint32_t syncId, RakNet::BitStream& bitStream) {
-	const auto index = this->m_managedBehaviors.find(skillUid);
+	const auto index = this->m_managedBehaviors.equal_range(skillUid);

-	if (index == this->m_managedBehaviors.end()) {
+	if (index.first == this->m_managedBehaviors.end()) {
 		LOG("Failed to find skill with uid (%i)!", skillUid, syncId);

 		return;
 	}

-	auto* context = index->second;
+	bool foundSyncId = false;
+	for (auto it = index.first; it != index.second && !foundSyncId; ++it) {
+		const auto& context = it->second;

-	context->SyncBehavior(syncId, bitStream);
+		foundSyncId = context->SyncBehavior(syncId, bitStream);
+	}
+
+	if (!foundSyncId) {
+		LOG("Failed to find sync id (%i) for skill with uid (%i)!", syncId, skillUid);
+	}
 }


@@ -138,7 +145,7 @@ void SkillComponent::Update(const float deltaTime) {
 		for (const auto& pair : this->m_managedBehaviors) pair.second->UpdatePlayerSyncs(deltaTime);
 	}

-	std::map<uint32_t, BehaviorContext*> keep{};
+	std::multimap<uint32_t, BehaviorContext*> keep{};

 	for (const auto& pair : this->m_managedBehaviors) {
 		auto* context = pair.second;
@@ -176,7 +183,7 @@ void SkillComponent::Update(const float deltaTime) {
 			}
 		}

-		keep.insert_or_assign(pair.first, context);
+		keep.insert({ pair.first, context });
 	}

 	this->m_managedBehaviors = keep;
@@ -285,7 +292,7 @@ SkillExecutionResult SkillComponent::CalculateBehavior(
 		return { false, 0 };
 	}

-	this->m_managedBehaviors.insert_or_assign(context->skillUId, context);
+	this->m_managedBehaviors.insert({ context->skillUId, context });

 	if (!clientInitalized) {
 		// Echo start skill
--- a/dGame/dComponents/SkillComponent.h
+++ b/dGame/dComponents/SkillComponent.h
@@ -188,7 +188,7 @@ private:
 	/**
 	 * All of the active skills mapped by their unique ID.
 	 */
-	std::map<uint32_t, BehaviorContext*> m_managedBehaviors;
+	std::multimap<uint32_t, BehaviorContext*> m_managedBehaviors;

 	/**
 	 * All active projectiles.
--- a/dGame/dComponents/VendorComponent.cpp
+++ b/dGame/dComponents/VendorComponent.cpp
@@ -76,8 +76,8 @@ void VendorComponent::RefreshInventory(bool isCreation) {
 				if (vendorItems.empty()) break;
 				auto randomItemIndex = GeneralUtils::GenerateRandomNumber<int32_t>(0, vendorItems.size() - 1);
 				const auto& randomItem = vendorItems.at(randomItemIndex);
-				vendorItems.erase(vendorItems.begin() + randomItemIndex);
 				if (SetupItem(randomItem.itemid)) m_Inventory.push_back(SoldItem(randomItem.itemid, randomItem.sortPriority));
+				vendorItems.erase(vendorItems.begin() + randomItemIndex);
 			}
 		}
 	}
--- a/dGame/dGameMessages/GameMessageHandler.cpp
+++ b/dGame/dGameMessages/GameMessageHandler.cpp
@@ -685,6 +685,13 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 	case eGameMessageType::REQUEST_VENDOR_STATUS_UPDATE:
 		GameMessages::SendVendorStatusUpdate(entity, sysAddr, true);
 		break;
+	case eGameMessageType::UPDATE_INVENTORY_GROUP:
+		GameMessages::HandleUpdateInventoryGroup(inStream, entity, sysAddr);
+		break;
+	case eGameMessageType::UPDATE_INVENTORY_GROUP_CONTENTS:
+		GameMessages::HandleUpdateInventoryGroupContents(inStream, entity, sysAddr);
+		break;
+
 	default:
 		LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());
 		break;
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -99,9 +99,11 @@
 #include "ActivityManager.h"
 #include "PlayerManager.h"
 #include "eVendorTransactionResult.h"
+#include "eReponseMoveItemBetweenInventoryTypeCode.h"

 #include "CDComponentsRegistryTable.h"
 #include "CDObjectsTable.h"
+#include "eItemType.h"

 void GameMessages::SendFireEventClientSide(const LWOOBJID& objectID, const SystemAddress& sysAddr, std::u16string args, const LWOOBJID& object, int64_t param1, int param2, const LWOOBJID& sender) {
 	CBITSTREAM;
@@ -4564,16 +4566,31 @@ void GameMessages::HandleRequestMoveItemBetweenInventoryTypes(RakNet::BitStream&
 	if (inStream.ReadBit()) inStream.Read(itemLOT);

 	if (invTypeDst == invTypeSrc) {
+		SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::FAIL_GENERIC);
 		return;
 	}

 	auto* inventoryComponent = entity->GetComponent<InventoryComponent>();

-	if (inventoryComponent != nullptr) {
+	if (inventoryComponent) {
 		if (itemID != LWOOBJID_EMPTY) {
 			auto* item = inventoryComponent->FindItemById(itemID);

-			if (!item) return;
+			if (!item) {
+				SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::FAIL_ITEM_NOT_FOUND);
+				return;
+			} 
+
+			if (item->GetLot() == 6086) { // Thinking hat
+				SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::FAIL_CANT_MOVE_THINKING_HAT);
+				return;
+			}
+			
+			auto* destInv = inventoryComponent->GetInventory(invTypeDst);
+			if (destInv && destInv->GetEmptySlots() == 0) {
+				SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::FAIL_INV_FULL);
+				return;
+			}

 			// Despawn the pet if we are moving that pet to the vault.
 			auto* petComponent = PetComponent::GetActivePet(entity->GetObjectID());
@@ -4582,10 +4599,32 @@ void GameMessages::HandleRequestMoveItemBetweenInventoryTypes(RakNet::BitStream&
 			}

 			inventoryComponent->MoveItemToInventory(item, invTypeDst, iStackCount, showFlyingLoot, false, false, destSlot);
+			SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::SUCCESS);
 		}
+	} else {
+		SendResponseMoveItemBetweenInventoryTypes(entity->GetObjectID(), sysAddr, invTypeDst, invTypeSrc, eReponseMoveItemBetweenInventoryTypeCode::FAIL_GENERIC);
 	}
 }

+void GameMessages::SendResponseMoveItemBetweenInventoryTypes(LWOOBJID objectId, const SystemAddress& sysAddr, eInventoryType inventoryTypeDestination, eInventoryType inventoryTypeSource, eReponseMoveItemBetweenInventoryTypeCode response) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(objectId);
+	bitStream.Write(eGameMessageType::RESPONSE_MOVE_ITEM_BETWEEN_INVENTORY_TYPES);
+
+	bitStream.Write(inventoryTypeDestination != eInventoryType::ITEMS);
+	if (inventoryTypeDestination != eInventoryType::ITEMS) bitStream.Write(inventoryTypeDestination);
+
+	bitStream.Write(inventoryTypeSource != eInventoryType::ITEMS);
+	if (inventoryTypeSource != eInventoryType::ITEMS) bitStream.Write(inventoryTypeSource);
+
+	bitStream.Write(response != eReponseMoveItemBetweenInventoryTypeCode::FAIL_GENERIC);
+	if (response != eReponseMoveItemBetweenInventoryTypeCode::FAIL_GENERIC) bitStream.Write(response);
+
+	SEND_PACKET;
+}
+

 void GameMessages::SendShowActivityCountdown(LWOOBJID objectId, bool bPlayAdditionalSound, bool bPlayCountdownSound, std::u16string sndName, int32_t stateToPlaySoundOn, const SystemAddress& sysAddr) {
 	CBITSTREAM;
@@ -5352,7 +5391,8 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream& inStream, En
 	iStackCount = std::min<uint32_t>(item->GetCount(), iStackCount);

 	if (bConfirmed) {
-		if (eInvType == eInventoryType::MODELS) {
+		const auto itemType = static_cast<eItemType>(item->GetInfo().itemType);
+		if (itemType == eItemType::MODEL || itemType == eItemType::LOOT_MODEL) {
 			item->DisassembleModel(iStackCount);
 		}
 		auto lot = item->GetLot();
@@ -6210,3 +6250,81 @@ void GameMessages::SendSlashCommandFeedbackText(Entity* entity, std::u16string t
 	auto sysAddr = entity->GetSystemAddress();
 	SEND_PACKET;
 }
+
+void GameMessages::HandleUpdateInventoryGroup(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
+	std::string action;
+	std::u16string groupName;
+	InventoryComponent::GroupUpdate groupUpdate;
+	bool locked{}; // All groups are locked by default
+
+	uint32_t size{};
+	if (!inStream.Read(size)) return;
+	action.resize(size);
+	if (!inStream.Read(action.data(), size)) return;
+
+	if (!inStream.Read(size)) return;
+	groupUpdate.groupId.resize(size);
+	if (!inStream.Read(groupUpdate.groupId.data(), size)) return;
+
+	if (!inStream.Read(size)) return;
+	groupName.resize(size);
+	if (!inStream.Read(reinterpret_cast<char*>(groupName.data()), size * 2)) return;
+
+	if (!inStream.Read(groupUpdate.inventory)) return;
+	if (!inStream.Read(locked)) return;
+
+	groupUpdate.groupName = GeneralUtils::UTF16ToWTF8(groupName);
+
+	if (action == "ADD") groupUpdate.command = InventoryComponent::GroupUpdateCommand::ADD;
+	else if (action == "MODIFY") groupUpdate.command = InventoryComponent::GroupUpdateCommand::MODIFY;
+	else if (action == "REMOVE") groupUpdate.command = InventoryComponent::GroupUpdateCommand::REMOVE;
+	else {
+		LOG("Invalid action %s", action.c_str());
+		return;
+	}
+
+	auto* inventoryComponent = entity->GetComponent<InventoryComponent>();
+	if (inventoryComponent) inventoryComponent->UpdateGroup(groupUpdate);
+}
+
+void GameMessages::HandleUpdateInventoryGroupContents(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
+	std::string action;
+	InventoryComponent::GroupUpdate groupUpdate;
+
+	uint32_t size{};
+	if (!inStream.Read(size)) return;
+	action.resize(size);
+	if (!inStream.Read(action.data(), size)) return;
+
+	if (action == "ADD") groupUpdate.command = InventoryComponent::GroupUpdateCommand::ADD_LOT;
+	else if (action == "REMOVE") groupUpdate.command = InventoryComponent::GroupUpdateCommand::REMOVE_LOT;
+	else {
+		LOG("Invalid action %s", action.c_str());
+		return;
+	}
+
+	if (!inStream.Read(size)) return;
+	groupUpdate.groupId.resize(size);
+	if (!inStream.Read(groupUpdate.groupId.data(), size)) return;
+
+	if (!inStream.Read(groupUpdate.inventory)) return;
+	if (!inStream.Read(groupUpdate.lot)) return;
+
+	auto* inventoryComponent = entity->GetComponent<InventoryComponent>();
+	if (inventoryComponent) inventoryComponent->UpdateGroup(groupUpdate);
+}
+
+void GameMessages::SendForceCameraTargetCycle(Entity* entity, bool bForceCycling, eCameraTargetCyclingMode cyclingMode, LWOOBJID optionalTargetID) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(entity->GetObjectID());
+	bitStream.Write(eGameMessageType::FORCE_CAMERA_TARGET_CYCLE);
+	bitStream.Write(bForceCycling);
+	bitStream.Write(cyclingMode != eCameraTargetCyclingMode::ALLOW_CYCLE_TEAMMATES);
+	if (cyclingMode != eCameraTargetCyclingMode::ALLOW_CYCLE_TEAMMATES) bitStream.Write(cyclingMode);
+	bitStream.Write(optionalTargetID);
+
+	auto sysAddr = entity->GetSystemAddress();
+	SEND_PACKET;
+}
--- a/dGame/dGameMessages/GameMessages.h
+++ b/dGame/dGameMessages/GameMessages.h
@@ -39,6 +39,12 @@ enum class eQuickBuildFailReason : uint32_t;
 enum class eQuickBuildState : uint32_t;
 enum class BehaviorSlot : int32_t;
 enum class eVendorTransactionResult : uint32_t;
+enum class eReponseMoveItemBetweenInventoryTypeCode : int32_t;
+
+enum class eCameraTargetCyclingMode : int32_t {
+	ALLOW_CYCLE_TEAMMATES,
+	DISALLOW_CYCLING
+};

 namespace GameMessages {
 	class PropertyDataMessage;
@@ -589,6 +595,7 @@ namespace GameMessages {
 	//NT:

 	void HandleRequestMoveItemBetweenInventoryTypes(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr);
+	void SendResponseMoveItemBetweenInventoryTypes(LWOOBJID objectId, const SystemAddress& sysAddr, eInventoryType inventoryTypeDestination, eInventoryType inventoryTypeSource, eReponseMoveItemBetweenInventoryTypeCode response);

 	void SendShowActivityCountdown(LWOOBJID objectId, bool bPlayAdditionalSound, bool bPlayCountdownSound, std::u16string sndName, int32_t stateToPlaySoundOn, const SystemAddress& sysAddr);

@@ -666,6 +673,10 @@ namespace GameMessages {
 	void HandleCancelDonationOnPlayer(RakNet::BitStream& inStream, Entity* entity);

 	void SendSlashCommandFeedbackText(Entity* entity, std::u16string text);
+
+	void HandleUpdateInventoryGroup(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr);
+	void HandleUpdateInventoryGroupContents(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr);
+	void SendForceCameraTargetCycle(Entity* entity, bool bForceCycling, eCameraTargetCyclingMode cyclingMode, LWOOBJID optionalTargetID);
 };

 #endif // GAMEMESSAGES_H
--- a/dGame/dMission/MissionTask.cpp
+++ b/dGame/dMission/MissionTask.cpp
@@ -186,7 +186,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&

 	if (count < 0) {
 		if (mission->IsMission() && type == eMissionTaskType::GATHER && InAllTargets(value)) {
-			if (parameters.size() > 0 && (parameters[0] & 1) != 0) {
+			if (parameters.size() > 0 && (parameters[0] & 4) != 0) {
 				return;
 			}

--- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.cpp
+++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.cpp
@@ -1,6 +1,8 @@
 #include "Action.h"
 #include "Amf3.h"

+#include "tinyxml2.h"
+
 Action::Action(const AMFArrayValue& arguments) {
 	for (const auto& [paramName, paramValue] : arguments.GetAssociative()) {
 		if (paramName == "Type") {
@@ -32,3 +34,46 @@ void Action::SendBehaviorBlocksToClient(AMFArrayValue& args) const {
 		actionArgs->Insert(m_ValueParameterName, m_ValueParameterDouble);
 	}
 }
+
+void Action::Serialize(tinyxml2::XMLElement& action) const {
+	action.SetAttribute("Type", m_Type.c_str());
+
+	if (m_ValueParameterName.empty()) return;
+
+	action.SetAttribute("ValueParameterName", m_ValueParameterName.c_str());
+
+	if (m_ValueParameterName == "Message") {
+		action.SetAttribute("Value", m_ValueParameterString.c_str());
+	} else {
+		action.SetAttribute("Value", m_ValueParameterDouble);
+	}
+}
+
+void Action::Deserialize(const tinyxml2::XMLElement& action) {
+	const char* type = nullptr;
+	action.QueryAttribute("Type", &type);
+	if (!type) {
+		LOG("No type found for an action?");
+		return;
+	}
+
+	m_Type = type;
+
+	const char* valueParameterName = nullptr;
+	action.QueryAttribute("ValueParameterName", &valueParameterName);
+	if (valueParameterName) {
+		m_ValueParameterName = valueParameterName;
+
+		if (m_ValueParameterName == "Message") {
+			const char* value = nullptr;
+			action.QueryAttribute("Value", &value);
+			if (value) {
+				m_ValueParameterString = value;
+			} else {
+				LOG("No value found for an action message?");
+			}
+		} else {
+			action.QueryDoubleAttribute("Value", &m_ValueParameterDouble);
+		}
+	}
+}
--- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h
+++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.h
@@ -3,6 +3,10 @@

 #include <string>

+namespace tinyxml2 {
+	class XMLElement;
+};
+
 class AMFArrayValue;

 /**
@@ -20,6 +24,8 @@ public:

 	void SendBehaviorBlocksToClient(AMFArrayValue& args) const;

+	void Serialize(tinyxml2::XMLElement& action) const;
+	void Deserialize(const tinyxml2::XMLElement& action);
 private:
 	double m_ValueParameterDouble{ 0.0 };
 	std::string m_Type{ "" };
--- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.cpp
+++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.cpp
@@ -1,6 +1,7 @@
 #include "StripUiPosition.h"

 #include "Amf3.h"
+#include "tinyxml2.h"

 StripUiPosition::StripUiPosition(const AMFArrayValue& arguments, const std::string& uiKeyName) {
 	const auto* const uiArray = arguments.GetArray(uiKeyName);
@@ -21,3 +22,13 @@ void StripUiPosition::SendBehaviorBlocksToClient(AMFArrayValue& args) const {
 	uiArgs->Insert("x", m_XPosition);
 	uiArgs->Insert("y", m_YPosition);
 }
+
+void StripUiPosition::Serialize(tinyxml2::XMLElement& position) const {
+	position.SetAttribute("x", m_XPosition);
+	position.SetAttribute("y", m_YPosition);
+}
+
+void StripUiPosition::Deserialize(const tinyxml2::XMLElement& position) {
+	position.QueryDoubleAttribute("x", &m_XPosition);
+	position.QueryDoubleAttribute("y", &m_YPosition);
+}
--- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h
+++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.h
@@ -3,6 +3,10 @@

 class AMFArrayValue;

+namespace tinyxml2 {
+	class XMLElement;
+}
+
 /**
 * @brief The position of the first Action in a Strip
 * 
@@ -15,6 +19,8 @@ public:
 	[[nodiscard]] double GetX() const noexcept { return m_XPosition; }
 	[[nodiscard]] double GetY() const noexcept { return m_YPosition; }

+	void Serialize(tinyxml2::XMLElement& position) const;
+	void Deserialize(const tinyxml2::XMLElement& position);
 private:
 	double m_XPosition{ 0.0 };
 	double m_YPosition{ 0.0 };
--- a/dGame/dPropertyBehaviors/PropertyBehavior.cpp
+++ b/dGame/dPropertyBehaviors/PropertyBehavior.cpp
@@ -3,6 +3,7 @@
 #include "Amf3.h"
 #include "BehaviorStates.h"
 #include "ControlBehaviorMsgs.h"
+#include "tinyxml2.h"

 PropertyBehavior::PropertyBehavior() {
 	m_LastEditedState = BehaviorState::HOME_STATE;
@@ -124,3 +125,31 @@ void PropertyBehavior::SendBehaviorBlocksToClient(AMFArrayValue& args) const {

 	// TODO Serialize the execution state of the behavior
 }
+
+void PropertyBehavior::Serialize(tinyxml2::XMLElement& behavior) const {
+	behavior.SetAttribute("id", m_BehaviorId);
+	behavior.SetAttribute("name", m_Name.c_str());
+	behavior.SetAttribute("isLocked", isLocked);
+	behavior.SetAttribute("isLoot", isLoot);
+
+	for (const auto& [stateId, state] : m_States) {
+		if (state.IsEmpty()) continue;
+		auto* const stateElement = behavior.InsertNewChildElement("State");
+		stateElement->SetAttribute("id", static_cast<uint32_t>(stateId));
+		state.Serialize(*stateElement);
+	}
+}
+
+
+void PropertyBehavior::Deserialize(const tinyxml2::XMLElement& behavior) {
+	m_Name = behavior.Attribute("name");
+	behavior.QueryBoolAttribute("isLocked", &isLocked);
+	behavior.QueryBoolAttribute("isLoot", &isLoot);
+
+	for (const auto* stateElement = behavior.FirstChildElement("State"); stateElement; stateElement = stateElement->NextSiblingElement("State")) {
+		int32_t stateId = -1;
+		stateElement->QueryIntAttribute("id", &stateId);
+		if (stateId < 0 || stateId > 5) continue;
+		m_States[static_cast<BehaviorState>(stateId)].Deserialize(*stateElement);
+	}
+}
--- a/dGame/dPropertyBehaviors/PropertyBehavior.h
+++ b/dGame/dPropertyBehaviors/PropertyBehavior.h
@@ -3,6 +3,10 @@

 #include "State.h"

+namespace tinyxml2 {
+	class XMLElement;
+}
+
 enum class BehaviorState : uint32_t;

 class AMFArrayValue;
@@ -25,6 +29,8 @@ public:
 	[[nodiscard]] int32_t GetBehaviorId() const noexcept { return m_BehaviorId; }
 	void SetBehaviorId(int32_t id) noexcept { m_BehaviorId = id; }

+	void Serialize(tinyxml2::XMLElement& behavior) const;
+	void Deserialize(const tinyxml2::XMLElement& behavior);
 private:

 	// The states this behavior has.
--- a/dGame/dPropertyBehaviors/State.cpp
+++ b/dGame/dPropertyBehaviors/State.cpp
@@ -2,6 +2,7 @@

 #include "Amf3.h"
 #include "ControlBehaviorMsgs.h"
+#include "tinyxml2.h"

 template <>
 void State::HandleMsg(AddStripMessage& msg) {
@@ -134,4 +135,20 @@ void State::SendBehaviorBlocksToClient(AMFArrayValue& args) const {

 		strip.SendBehaviorBlocksToClient(*stripArgs);
 	}
-};
+}
+
+void State::Serialize(tinyxml2::XMLElement& state) const {
+	for (const auto& strip : m_Strips) {
+		if (strip.IsEmpty()) continue;
+
+		auto* const stripElement = state.InsertNewChildElement("Strip");
+		strip.Serialize(*stripElement);
+	}
+}
+
+void State::Deserialize(const tinyxml2::XMLElement& state) {
+	for (const auto* stripElement = state.FirstChildElement("Strip"); stripElement; stripElement = stripElement->NextSiblingElement("Strip")) {
+		auto& strip = m_Strips.emplace_back();
+		strip.Deserialize(*stripElement);
+	}
+}
--- a/dGame/dPropertyBehaviors/State.h
+++ b/dGame/dPropertyBehaviors/State.h
@@ -3,6 +3,10 @@

 #include "Strip.h"

+namespace tinyxml2 {
+	class XMLElement;
+}
+
 class AMFArrayValue;

 class State {
@@ -13,6 +17,8 @@ public:
 	void SendBehaviorBlocksToClient(AMFArrayValue& args) const;
 	bool IsEmpty() const;

+	void Serialize(tinyxml2::XMLElement& state) const;
+	void Deserialize(const tinyxml2::XMLElement& state);
 private:
 	std::vector<Strip> m_Strips;
 };
--- a/dGame/dPropertyBehaviors/Strip.cpp
+++ b/dGame/dPropertyBehaviors/Strip.cpp
@@ -2,6 +2,7 @@

 #include "Amf3.h"
 #include "ControlBehaviorMsgs.h"
+#include "tinyxml2.h"

 template <>
 void Strip::HandleMsg(AddStripMessage& msg) {
@@ -83,4 +84,25 @@ void Strip::SendBehaviorBlocksToClient(AMFArrayValue& args) const {
 	for (const auto& action : m_Actions) {
 		action.SendBehaviorBlocksToClient(*actions);
 	}
-};
+}
+
+void Strip::Serialize(tinyxml2::XMLElement& strip) const {
+	auto* const positionElement = strip.InsertNewChildElement("Position");
+	m_Position.Serialize(*positionElement);
+	for (const auto& action : m_Actions) {
+		auto* const actionElement = strip.InsertNewChildElement("Action");
+		action.Serialize(*actionElement);
+	}
+}
+
+void Strip::Deserialize(const tinyxml2::XMLElement& strip) {
+	const auto* positionElement = strip.FirstChildElement("Position");
+	if (positionElement) {
+		m_Position.Deserialize(*positionElement);
+	}
+
+	for (const auto* actionElement = strip.FirstChildElement("Action"); actionElement; actionElement = actionElement->NextSiblingElement("Action")) {
+		auto& action = m_Actions.emplace_back();
+		action.Deserialize(*actionElement);
+	}
+}
--- a/dGame/dPropertyBehaviors/Strip.h
+++ b/dGame/dPropertyBehaviors/Strip.h
@@ -6,6 +6,10 @@

 #include <vector>

+namespace tinyxml2 {
+	class XMLElement;
+}
+
 class AMFArrayValue;

 class Strip {
@@ -16,6 +20,8 @@ public:
 	void SendBehaviorBlocksToClient(AMFArrayValue& args) const;
 	bool IsEmpty() const noexcept { return m_Actions.empty(); }

+	void Serialize(tinyxml2::XMLElement& strip) const;
+	void Deserialize(const tinyxml2::XMLElement& strip);
 private:
 	std::vector<Action> m_Actions;
 	StripUiPosition m_Position;
--- a/dGame/dUtilities/Preconditions.cpp
+++ b/dGame/dUtilities/Preconditions.cpp
@@ -26,7 +26,8 @@ Precondition::Precondition(const uint32_t condition) {
 	if (result.eof()) {
 		this->type = PreconditionType::ItemEquipped;
 		this->count = 1;
-		this->values = { 0 };
+		this->values.clear();
+		this->values.push_back(0);

 		LOG("Failed to find precondition of id (%i)!", condition);

@@ -138,21 +139,20 @@ bool Precondition::CheckValue(Entity* player, const uint32_t value, bool evaluat
 	case PreconditionType::DoesNotHaveItem:
 		return inventoryComponent->IsEquipped(value) < count;
 	case PreconditionType::HasAchievement:
-		mission = missionComponent->GetMission(value);
-
-		return mission == nullptr || mission->GetMissionState() >= eMissionState::COMPLETE;
+		if (missionComponent == nullptr) return false;
+		return missionComponent->GetMissionState(value) >= eMissionState::COMPLETE;
 	case PreconditionType::MissionAvailable:
-		mission = missionComponent->GetMission(value);
-
-		return mission == nullptr || mission->GetMissionState() >= eMissionState::AVAILABLE;
+		if (missionComponent == nullptr) return false;
+		return missionComponent->GetMissionState(value) == eMissionState::AVAILABLE || missionComponent->GetMissionState(value) == eMissionState::COMPLETE_AVAILABLE;
 	case PreconditionType::OnMission:
-		mission = missionComponent->GetMission(value);
-
-		return mission == nullptr || mission->GetMissionState() >= eMissionState::ACTIVE;
+		if (missionComponent == nullptr) return false;
+		return  missionComponent->GetMissionState(value) == eMissionState::ACTIVE || 
+				missionComponent->GetMissionState(value) == eMissionState::COMPLETE_ACTIVE ||
+				missionComponent->GetMissionState(value) == eMissionState::READY_TO_COMPLETE ||
+				missionComponent->GetMissionState(value) == eMissionState::COMPLETE_READY_TO_COMPLETE;
 	case PreconditionType::MissionComplete:
-		mission = missionComponent->GetMission(value);
-
-		return mission == nullptr ? false : mission->GetMissionState() >= eMissionState::COMPLETE;
+		if (missionComponent == nullptr) return false;
+		return missionComponent->GetMissionState(value) >= eMissionState::COMPLETE;
 	case PreconditionType::PetDeployed:
 		return false; // TODO
 	case PreconditionType::HasFlag:
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -31,7 +31,6 @@ void SlashCommandHandler::RegisterCommand(Command command) {
 	}

 	for (const auto& alias : command.aliases) {
-		LOG_DEBUG("Registering command %s", alias.c_str());
 		auto [_, success] = RegisteredCommands.try_emplace(alias, command);
 		// Don't allow duplicate commands
 		if (!success) {
@@ -929,6 +928,15 @@ void SlashCommandHandler::Startup() {
 	};
 	RegisterCommand(FindPlayerCommand);

+	Command SpectateCommand{
+		.help = "Spectate a player",
+		.info = "Specify a player name to spectate. They must be in the same world as you. Leave blank to stop spectating",
+		.aliases = { "spectate", "follow" },
+		.handle = GMGreaterThanZeroCommands::Spectate,
+		.requiredLevel = eGameMasterLevel::JUNIOR_MODERATOR
+	};
+	RegisterCommand(SpectateCommand);
+
 	// Register GM Zero Commands

 	Command HelpCommand{
--- a/dGame/dUtilities/SlashCommands/GMGreaterThanZeroCommands.cpp
+++ b/dGame/dUtilities/SlashCommands/GMGreaterThanZeroCommands.cpp
@@ -322,4 +322,19 @@ namespace GMGreaterThanZeroCommands {
 		request.Serialize(bitStream);
 		Game::chatServer->Send(&bitStream, SYSTEM_PRIORITY, RELIABLE, 0, Game::chatSysAddr, false);
 	}
+
+	void Spectate(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
+		if (args.empty()) {
+			GameMessages::SendForceCameraTargetCycle(entity, false, eCameraTargetCyclingMode::DISALLOW_CYCLING, entity->GetObjectID());
+			return;
+		}
+
+		auto player = PlayerManager::GetPlayer(args);
+		if (!player) {
+			GameMessages::SendSlashCommandFeedbackText(entity, u"Player not found");
+			return;
+		}
+		GameMessages::SendSlashCommandFeedbackText(entity, u"Spectating Player");
+		GameMessages::SendForceCameraTargetCycle(entity, false, eCameraTargetCyclingMode::DISALLOW_CYCLING, player->GetObjectID());
+	}
 }
--- a/dGame/dUtilities/SlashCommands/GMGreaterThanZeroCommands.h
+++ b/dGame/dUtilities/SlashCommands/GMGreaterThanZeroCommands.h
@@ -15,6 +15,7 @@ namespace GMGreaterThanZeroCommands {
 	void Title(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void ShowAll(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void FindPlayer(Entity* entity, const SystemAddress& sysAddr, const std::string args);
+	void Spectate(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 }

 #endif  //!GMGREATERTHANZEROCOMMANDS_H
--- a/dGame/dUtilities/VanityUtilities.cpp
+++ b/dGame/dUtilities/VanityUtilities.cpp
@@ -285,7 +285,6 @@ void ParseXml(const std::string& file) {
 				}

 				if (zoneID.value() != currentZoneID) {
-					LOG_DEBUG("Skipping (%s) %i location because it is in %i and not the current zone (%i)", name, lot, zoneID.value(), currentZoneID);
 					continue;
 				}

--- a/dMasterServer/CMakeLists.txt
+++ b/dMasterServer/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(MasterServer ${COMMON_LIBRARIES} bcrypt dMasterServer dSer
 if(WIN32)
 	add_dependencies(MasterServer WorldServer AuthServer ChatServer)
 endif()
+DoAppleMariaDBCopy(MasterServer ${CMAKE_BINARY_DIR})
--- a/dMasterServer/MasterServer.cpp
+++ b/dMasterServer/MasterServer.cpp
@@ -40,6 +40,8 @@
 #include "BitStreamUtils.h"
 #include "Start.h"
 #include "Server.h"
+#include "CDZoneTableTable.h"
+#include "eGameMasterLevel.h"

 namespace Game {
 	Logger* logger = nullptr;
@@ -186,15 +188,20 @@ int main(int argc, char** argv) {
 		std::cout << "Enter a username: ";
 		std::cin >> username;

+		const auto checkIsAdmin = []() {
+			std::string admin;
+			std::cout << "What level of privilege should this account have? Please enter a number between 0 (Player) and 9 (Admin) inclusive. No entry will default to 0." << std::endl;
+			std::cin >> admin;
+			return admin;
+			};
+
 		auto accountId = Database::Get()->GetAccountInfo(username);
-		if (accountId) {
+		if (accountId && accountId->id != 0) {
 			LOG("Account with name \"%s\" already exists", username.c_str());
 			std::cout << "Do you want to change the password of that account? [y/n]?";
 			std::string prompt = "";
 			std::cin >> prompt;
 			if (prompt == "y" || prompt == "yes") {
-				if (accountId->id == 0) return EXIT_FAILURE;
-
 				//Read the password from the console without echoing it.
 #ifdef __linux__
 		//This function is obsolete, but it only meant to be used by the
@@ -219,6 +226,20 @@ int main(int argc, char** argv) {
 			} else {
 				LOG("Account \"%s\" was not updated.", username.c_str());
 			}
+
+			std::cout << "Update admin privileges? [y/n]? ";
+			std::string admin;
+			std::cin >> admin;
+			bool updateAdmin = admin == "y" || admin == "yes";
+			if (updateAdmin) {
+				auto gmLevel = GeneralUtils::TryParse<int32_t>(checkIsAdmin()).value_or(0);
+				if (gmLevel > 9 || gmLevel < 0) {
+					LOG("Invalid admin level.  Defaulting to 0");
+					gmLevel = 0;
+				}
+				Database::Get()->UpdateAccountGmLevel(accountId->id, static_cast<eGameMasterLevel>(gmLevel));
+			}
+
 			return EXIT_SUCCESS;
 		}

@@ -249,6 +270,17 @@ int main(int argc, char** argv) {
 		}

 		LOG("Account created successfully!");
+
+		accountId = Database::Get()->GetAccountInfo(username);
+		if (accountId) {
+			auto gmLevel = GeneralUtils::TryParse<int32_t>(checkIsAdmin()).value_or(0);
+			if (gmLevel > 9 || gmLevel < 0) {
+				LOG("Invalid admin level.  Defaulting to 0");
+				gmLevel = 0;
+			}
+			Database::Get()->UpdateAccountGmLevel(accountId->id, static_cast<eGameMasterLevel>(gmLevel));
+		}
+
 		return EXIT_SUCCESS;
 	}

@@ -277,6 +309,17 @@ int main(int argc, char** argv) {
 	PersistentIDManager::Initialize();
 	Game::im = new InstanceManager(Game::logger, Game::server->GetIP());

+	//Get CDClient initial information
+	try {
+		CDClientManager::LoadValuesFromDatabase();
+	} catch (CppSQLite3Exception& e) {
+		LOG("Failed to initialize CDServer SQLite Database");
+		LOG("May be caused by corrupted file: %s", (Game::assetManager->GetResPath() / "CDServer.sqlite").string().c_str());
+		LOG("Error: %s", e.errorMessage());
+		LOG("Error Code: %i", e.errorCode());
+		return EXIT_FAILURE;
+	}
+
 	//Depending on the config, start up servers:
 	if (Game::config->GetValue("prestart_servers") != "0") {
 		StartChatServer();
@@ -382,6 +425,7 @@ int main(int argc, char** argv) {
 }

 void HandlePacket(Packet* packet) {
+	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION) {
 		LOG("A server has disconnected");

@@ -545,7 +589,7 @@ void HandlePacket(Packet* packet) {
 			inStream.Read(sessionKey);
 			LUString username;
 			inStream.Read(username);
-	
+
 			for (auto it : activeSessions) {
 				if (it.second == username.string) {
 					activeSessions.erase(it.first);
--- a/dNet/BitStreamUtils.h
+++ b/dNet/BitStreamUtils.h
@@ -5,6 +5,7 @@
 #include "MessageIdentifiers.h"
 #include "BitStream.h"
 #include <string>
+#include <algorithm>

 enum class eConnectionType : uint16_t;

--- a/dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp
+++ b/dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp
@@ -15,6 +15,7 @@
 #include "SkillComponent.h"
 #include "eReplicaComponentType.h"
 #include "RenderComponent.h"
+#include "PlayerManager.h"

 #include <vector>

@@ -53,11 +54,13 @@ void BossSpiderQueenEnemyServer::OnStartup(Entity* self) {

 void BossSpiderQueenEnemyServer::OnDie(Entity* self, Entity* killer) {
 	if (Game::zoneManager->GetZoneID().GetMapID() == instanceZoneID && killer) {
-		auto* missionComponent = killer->GetComponent<MissionComponent>();
-		if (missionComponent == nullptr)
-			return;
+		for (const auto& player : PlayerManager::GetAllPlayers()) {
+			auto* missionComponent = player->GetComponent<MissionComponent>();
+			if (missionComponent == nullptr)
+				return;

-		missionComponent->CompleteMission(instanceMissionID);
+			missionComponent->CompleteMission(instanceMissionID);
+		}
 	}

 	// There is suppose to be a 0.1 second delay here but that may be admitted?
--- a/dScripts/CppScripts.cpp
+++ b/dScripts/CppScripts.cpp
@@ -14,6 +14,7 @@
 #include "AgShipPlayerDeathTrigger.h"
 #include "AgShipPlayerShockServer.h"
 #include "AgSpaceStuff.h"
+#include "AgShipShake.h"
 #include "AgImagSmashable.h"
 #include "NpcNpSpacemanBob.h"
 #include "StoryBoxInteractServer.h"
@@ -341,6 +342,7 @@ namespace {
 		{ "scripts\\ai\\AG\\L_AG_SHIP_PLAYER_DEATH_TRIGGER.lua", []() { return new AgShipPlayerDeathTrigger(); } },
 		{"scripts\\ai\\NP\\L_NPC_NP_SPACEMAN_BOB.lua", []() { return new NpcNpSpacemanBob(); } },
 		{"scripts\\ai\\AG\\L_AG_SPACE_STUFF.lua", []() { return new AgSpaceStuff();} },
+		{"scripts\\ai\\AG\\L_AG_SHIP_SHAKE.lua", []() { return new AgShipShake();}},
 		{"scripts\\ai\\AG\\L_AG_SHIP_PLAYER_SHOCK_SERVER.lua", []() { return new AgShipPlayerShockServer();} },
 		{"scripts\\ai\\AG\\L_AG_IMAG_SMASHABLE.lua", []() { return new AgImagSmashable();} },
 		{"scripts\\02_server\\Map\\General\\L_STORY_BOX_INTERACT_SERVER.lua", []() { return new StoryBoxInteractServer();} },
@@ -580,6 +582,7 @@ namespace {
 		{"scripts\\02_server\\Map\\AM\\L_SKULLKIN_DRILL_STAND.lua", []() {return new AmSkullkinDrillStand();}},
 		{"scripts\\02_server\\Map\\AM\\L_SKULLKIN_TOWER.lua", []() {return new AmSkullkinTower();}},
 		{"scripts\\02_server\\Enemy\\AM\\L_AM_NAMED_DARKLING_DRAGON.lua", []() {return new AmDarklingDragon();}},
+		{"scripts\\02_server\\Enemy\\AM\\L_AM_DARKLING_DRAGON.lua", []() {return new AmDarklingDragon();}},
 		{"scripts\\02_server\\Enemy\\AM\\L_AM_DARKLING_APE.lua", []() {return new BaseEnemyApe();}},
 		{"scripts\\02_server\\Map\\AM\\L_BLUE_X.lua", []() {return new AmBlueX();}},
 		{"scripts\\02_server\\Map\\AM\\L_TEAPOT_SERVER.lua", []() {return new AmTeapotServer();}},
@@ -654,6 +657,7 @@ namespace {

 		//Pickups
 		{"scripts\\ai\\SPEC\\L_SPECIAL_1_BRONZE-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(1);}},
+		{"scripts\\ai\\SPEC\\L_SPECIAL_1_GOLD-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(10000);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_1_SILVER-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(100);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_10_BRONZE-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(10);}},
 		{"scripts\\ai\\SPEC\\L_SPECIAL_10_GOLD-COIN-SPAWNER.lua", []() {return new SpecialCoinSpawner(100000);}},
@@ -700,7 +704,8 @@ CppScripts::Script* const CppScripts::GetScript(Entity* parent, const std::strin
 			(scriptName == "scripts\\02_server\\Enemy\\General\\L_BASE_ENEMY_SPIDERLING.lua") ||
 			(scriptName == "scripts\\ai\\FV\\L_ACT_NINJA_STUDENT.lua") ||
 			(scriptName == "scripts\\ai\\WILD\\L_WILD_GF_FROG.lua") ||
-			(scriptName == "scripts\\empty.lua")
+			(scriptName == "scripts\\empty.lua") ||
+			(scriptName == "scripts\\ai\\AG\\L_AG_SENTINEL_GUARD.lua")
 			)) LOG_DEBUG("LOT %i attempted to load CppScript for '%s', but returned InvalidScript.", parent->GetLOT(), scriptName.c_str());
 	}

--- a/dScripts/ai/AG/AgShipShake.cpp
+++ b/dScripts/ai/AG/AgShipShake.cpp
@@ -0,0 +1,81 @@
+#include "AgShipShake.h"
+#include "EntityInfo.h"
+#include "GeneralUtils.h"
+#include "GameMessages.h"
+#include "EntityManager.h"
+#include "RenderComponent.h"
+#include "Entity.h"
+
+void AgShipShake::OnStartup(Entity* self) {
+	EntityInfo info{};
+
+	info.pos = { -418, 585, -30 };
+	info.lot = 33;
+	info.spawnerID = self->GetObjectID();
+
+	auto* ref = Game::entityManager->CreateEntity(info);
+
+	Game::entityManager->ConstructEntity(ref);
+
+	self->SetVar(u"ShakeObject", ref->GetObjectID());
+
+	self->AddTimer("ShipShakeIdle", 2.0f);
+	self->SetVar(u"RandomTime", 10);
+}
+
+void AgShipShake::OnTimerDone(Entity* self, std::string timerName) {
+	auto* shipFxObject = GetEntityInGroup(ShipFX);
+	auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
+	auto* debrisObject = GetEntityInGroup(DebrisFX);
+	if (timerName == "ShipShakeIdle") {
+		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
+
+		const auto randomTime = self->GetVar<int>(u"RandomTime");
+		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
+
+		if (time < randomTime / 2) {
+			time += randomTime / 2;
+		}
+
+		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
+
+		if (ref)
+			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
+
+
+		if (debrisObject)
+			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+
+		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
+
+		if (shipFxObject) {
+			std::string effectType = "shipboom" + std::to_string(randomFx);
+			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
+		}
+
+		self->AddTimer("ShipShakeExplode", 5.0f);
+
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
+	} else if (timerName == "ShipShakeExplode") {
+		if (shipFxObject)
+			RenderComponent::PlayAnimation(shipFxObject, u"idle");
+		if (shipFxObject2)
+			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
+	}
+}
+
+Entity* AgShipShake::GetEntityInGroup(const std::string& group) {
+	auto entities = Game::entityManager->GetEntitiesInGroup(group);
+	Entity* en = nullptr;
+
+	for (auto entity : entities) {
+		if (entity) {
+			en = entity;
+			break;
+		}
+	}
+
+	return en;
+}
+
--- a/dScripts/ai/AG/AgShipShake.h
+++ b/dScripts/ai/AG/AgShipShake.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "CppScripts.h"
+
+class AgShipShake : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+	void OnTimerDone(Entity* self, std::string timerName) override;
+
+	std::string DebrisFX = "DebrisFX";
+	std::string ShipFX = "ShipFX";
+	std::string ShipFX2 = "ShipFX2";
+	std::u16string FXName = u"camshake-bridge";
+
+private:
+	Entity* GetEntityInGroup(const std::string& group);
+};
--- a/dScripts/ai/AG/AgSpaceStuff.cpp
+++ b/dScripts/ai/AG/AgSpaceStuff.cpp
@@ -8,21 +8,6 @@

 void AgSpaceStuff::OnStartup(Entity* self) {
 	self->AddTimer("FloaterScale", 5.0f);
-
-	EntityInfo info{};
-
-	info.pos = { -418, 585, -30 };
-	info.lot = 33;
-	info.spawnerID = self->GetObjectID();
-
-	auto* ref = Game::entityManager->CreateEntity(info);
-
-	Game::entityManager->ConstructEntity(ref);
-
-	self->SetVar(u"ShakeObject", ref->GetObjectID());
-
-	self->AddTimer("ShipShakeIdle", 2.0f);
-	self->SetVar(u"RandomTime", 10);
 }

 void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {
@@ -37,70 +22,5 @@ void AgSpaceStuff::OnTimerDone(Entity* self, std::string timerName) {

 		RenderComponent::PlayAnimation(self, u"path_0" + (GeneralUtils::to_u16string(pathType)));
 		self->AddTimer("FloaterScale", randTime);
-	} else if (timerName == "ShipShakeExplode") {
-		DoShake(self, true);
-	} else if (timerName == "ShipShakeIdle") {
-		DoShake(self, false);
 	}
 }
-
-void AgSpaceStuff::DoShake(Entity* self, bool explodeIdle) {
-
-	if (!explodeIdle) {
-		auto* ref = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(u"ShakeObject"));
-
-		const auto randomTime = self->GetVar<int>(u"RandomTime");
-		auto time = GeneralUtils::GenerateRandomNumber<int>(0, randomTime + 1);
-
-		if (time < randomTime / 2) {
-			time += randomTime / 2;
-		}
-
-		self->AddTimer("ShipShakeIdle", static_cast<float>(time));
-
-		if (ref)
-			GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(ref, FXName, ref->GetObjectID(), 500.0f);
-
-		auto* debrisObject = GetEntityInGroup(DebrisFX);
-
-		if (debrisObject)
-			GameMessages::SendPlayFXEffect(debrisObject, -1, u"DebrisFall", "Debris", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-
-		const auto randomFx = GeneralUtils::GenerateRandomNumber<int>(0, 3);
-
-		auto* shipFxObject = GetEntityInGroup(ShipFX);
-		if (shipFxObject) {
-			std::string effectType = "shipboom" + std::to_string(randomFx);
-			GameMessages::SendPlayFXEffect(shipFxObject, 559, GeneralUtils::ASCIIToUTF16(effectType), "FX", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
-		}
-
-		self->AddTimer("ShipShakeExplode", 5.0f);
-
-		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"explosion");
-	} else {
-		auto* shipFxObject = GetEntityInGroup(ShipFX);
-		auto* shipFxObject2 = GetEntityInGroup(ShipFX2);
-
-		if (shipFxObject)
-			RenderComponent::PlayAnimation(shipFxObject, u"idle");
-
-		if (shipFxObject2)
-			RenderComponent::PlayAnimation(shipFxObject2, u"idle");
-	}
-}
-
-Entity* AgSpaceStuff::GetEntityInGroup(const std::string& group) {
-	auto entities = Game::entityManager->GetEntitiesInGroup(group);
-	Entity* en = nullptr;
-
-	for (auto entity : entities) {
-		if (entity) {
-			en = entity;
-			break;
-		}
-	}
-
-	return en;
-}
--- a/dScripts/ai/AG/AgSpaceStuff.h
+++ b/dScripts/ai/AG/AgSpaceStuff.h
@@ -5,14 +5,5 @@ class AgSpaceStuff : public CppScripts::Script {
 public:
 	void OnStartup(Entity* self);
 	void OnTimerDone(Entity* self, std::string timerName);
-	void DoShake(Entity* self, bool explodeIdle);
-
-	std::string DebrisFX = "DebrisFX";
-	std::string ShipFX = "ShipFX";
-	std::string ShipFX2 = "ShipFX2";
-	std::u16string FXName = u"camshake-bridge";
-
-private:
-	Entity* GetEntityInGroup(const std::string& group);
 };

--- a/dScripts/ai/AG/CMakeLists.txt
+++ b/dScripts/ai/AG/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(DSCRIPTS_SOURCES_AI_AG 
 	"AgShipPlayerDeathTrigger.cpp"
 	"AgSpaceStuff.cpp"
+    "AgShipShake.cpp"
 	"AgShipPlayerShockServer.cpp"
 	"AgImagSmashable.cpp"
 	"ActSharkPlayerDeathTrigger.cpp"
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -359,7 +359,7 @@ int main(int argc, char** argv) {

 		//Warning if we ran slow
 		if (deltaTime > currentFrameDelta) {
-			LOG("We're running behind, dT: %f > %f (framerate %i)", deltaTime, currentFrameDelta, currentFramerate);
+			LOG("We're running behind, dT: %f > %i (framerate %i)", deltaTime, currentFrameDelta, currentFramerate);
 		}

 		//Check if we're still connected to master:
@@ -529,6 +529,7 @@ int main(int argc, char** argv) {
 }

 void HandlePacketChat(Packet* packet) {
+	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
 		LOG("Lost our connection to chat, zone(%i), instance(%i)", Game::server->GetZoneID(), Game::server->GetInstanceID());

@@ -542,7 +543,7 @@ void HandlePacketChat(Packet* packet) {
 		chatConnected = true;
 	}

-	if (packet->data[0] == ID_USER_PACKET_ENUM) {
+	if (packet->data[0] == ID_USER_PACKET_ENUM && packet->length >= 4) {
 		if (static_cast<eConnectionType>(packet->data[1]) == eConnectionType::CHAT) {
 			switch (static_cast<eChatMessageType>(packet->data[3])) {
 				case eChatMessageType::WORLD_ROUTE_PACKET: {
@@ -557,8 +558,9 @@ void HandlePacketChat(Packet* packet) {

 					//Write our stream outwards:
 					CBITSTREAM;
-					for (BitSize_t i = 0; i < inStream.GetNumberOfBytesUsed(); i++) {
-						bitStream.Write(packet->data[i + 16]); //16 bytes == header + playerID to skip
+					unsigned char data;
+					while (inStream.Read(data)) {
+						bitStream.Write(data);
 					}

 					SEND_PACKET; //send routed packet to player
@@ -659,7 +661,7 @@ void HandlePacketChat(Packet* packet) {
 }

 void HandleMasterPacket(Packet* packet) {
-
+	if (packet->length < 2) return;
 	if (static_cast<eConnectionType>(packet->data[1]) != eConnectionType::MASTER || packet->length < 4) return;
 	switch (static_cast<eMasterMessageType>(packet->data[3])) {
 	case eMasterMessageType::REQUEST_PERSISTENT_ID_RESPONSE: {
@@ -785,6 +787,7 @@ void HandleMasterPacket(Packet* packet) {
 }

 void HandlePacket(Packet* packet) {
+	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
 		auto user = UserManager::Instance()->GetUser(packet->systemAddress);
 		if (!user) return;
@@ -1207,8 +1210,8 @@ void HandlePacket(Packet* packet) {

 		//Now write the rest of the data:
 		auto data = inStream.GetData();
-		for (uint32_t i = 0; i < size; ++i) {
-			bitStream.Write(data[i + 23]);
+		for (uint32_t i = 23; i - 23 < size && i < packet->length; ++i) {
+			bitStream.Write(data[i]);
 		}

 		Game::chatServer->Send(&bitStream, SYSTEM_PRIORITY, RELIABLE_ORDERED, 0, Game::chatSysAddr, false);
--- a/migrations/dlu/15_behavior_owner.sql
+++ b/migrations/dlu/15_behavior_owner.sql
@@ -0,0 +1,3 @@
+ALTER TABLE behaviors ADD COLUMN character_id BIGINT NOT NULL DEFAULT 0;
+ALTER TABLE behaviors ADD COLUMN behavior_id BIGINT NOT NULL PRIMARY KEY;
+ALTER TABLE behaviors DROP COLUMN id; 
--- a/migrations/dlu/16_big_behaviors.sql
+++ b/migrations/dlu/16_big_behaviors.sql
@@ -0,0 +1 @@
+ALTER TABLE behaviors MODIFY behavior_info LONGTEXT DEFAULT NULL;
--- a/resources/navmeshes.zip
+++ b/resources/navmeshes.zip
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,6 +15,11 @@ endif()
 add_custom_target(conncpp_tests
 	${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

+if(MSVC)
+	add_custom_target(zlib_tests
+		${CMAKE_COMMAND} -E copy $<TARGET_FILE:ZLIB::ZLIB> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
+
 # Add the subdirectories
 add_subdirectory(dCommonTests)
 add_subdirectory(dGameTests)
--- a/tests/dCommonTests/CMakeLists.txt
+++ b/tests/dCommonTests/CMakeLists.txt
@@ -18,18 +18,11 @@ list(APPEND DCOMMONTEST_SOURCES ${DENUMS_TESTS})
 # Set our executable
 add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
 add_dependencies(dCommonTests conncpp_tests)
-
-# Apple needs some special linkage for the mariadb connector for tests.
-if(APPLE)
-add_custom_command(TARGET dCommonTests POST_BUILD
-	COMMAND otool ARGS -l dCommonTests
-	COMMAND otool ARGS -L dCommonTests
-	COMMAND ls
-	COMMAND otool ARGS -D libmariadbcpp.dylib
-	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests
-	COMMAND otool ARGS -L dCommonTests
-	WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+if(MSVC)
+	add_dependencies(dCommonTests zlib_tests)
 endif()
+# Apple needs some special linkage for the mariadb connector for tests.
+DoAppleMariaDBCopy(dCommonTests ${CMAKE_CURRENT_BINARY_DIR})

 # Link needed libraries
 target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main)
--- a/tests/dGameTests/CMakeLists.txt
+++ b/tests/dGameTests/CMakeLists.txt
@@ -15,12 +15,7 @@ add_executable(dGameTests ${DGAMETEST_SOURCES})
 add_dependencies(dGameTests conncpp_tests)

 # Apple needs some special linkage for the mariadb connector for tests.
-if(APPLE)
-add_custom_command(TARGET dGameTests POST_BUILD
-	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dGameTests
-	COMMAND otool ARGS -L dGameTests
-	WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-endif()
+DoAppleMariaDBCopy(dGameTests ${CMAKE_CURRENT_BINARY_DIR})

 target_link_libraries(dGameTests ${COMMON_LIBRARIES} GTest::gtest_main
 	dGame dScripts dPhysics Detour Recast tinyxml2 dWorldServer dZoneManager dChatFilter dNavigation)
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -23,6 +23,11 @@ if(NOT WIN32)
 	target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
 endif()

+# Need to define this on Clang and GNU for 'strdup' support
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L")
+endif()
+
 target_include_directories(bcrypt INTERFACE "libbcrypt/include")
 target_include_directories(bcrypt PRIVATE "libbcrypt/src")
Author	SHA1	Message	Date
David Markowitz	7513dc6f49	Merge branch 'fix-windows-debug' of https://github.com/DarkflameUniverse/DarkflameServer into fix-windows-debug	2024-10-28 00:31:01 -07:00
David Markowitz	26a9d2eaaa	use a name for the config	2024-10-28 00:30:49 -07:00
EmosewaMC	bb143ccf21	apple pls	2024-10-28 00:16:39 -07:00
David Markowitz	0509aaf855	Update to have debug and release builds	2024-10-27 20:07:00 -07:00
David Markowitz	e0b54645dc	copy over zlibd debug file probably fixes other issues, but makes it so windows debug builds work again also adds windows debug building to catch this stuff	2024-10-27 11:10:17 -07:00
David Markowitz	102e3556cf	feat: add millisecond tracking for racing (#1615 ) * add millisecond tracking Update RacingControlComponent.cpp * remove const ig? * is this what you wanted	2024-10-26 22:59:50 -05:00
David Markowitz	33a8efdd22	fix slow code, add bounds checks (#1606 ) Tested that players with valid names up to the usual 33 character max are still added to the player container Tested that you can still team with <= 4 players on a team Tested that chat server no longer crashes with a bad memberSize variable asserted that InsertPlayer is indeed much faster now and is no longer a slow point of ChatServer	2024-10-26 22:09:32 -05:00
David Markowitz	8d54db7851	Update WorldServer.cpp (#1633 )	2024-09-13 09:45:55 -07:00
David Markowitz	6213aed8e5	fix ag navmesh near burtton (#1626 ) tested that pets now correctly try to activate the button instead of standing idly by.	2024-09-13 09:45:46 -07:00
wincent	d57c5101f4	Amend preconditions fix	2024-09-12 15:33:09 +02:00
wincent	6be65569de	Fixed mission related preconditions	2024-09-10 12:41:38 +02:00
David Markowitz	94b9731a2b	Use the correct bit field for checking whether or not to decrement progress (#1631 ) Tested that the cooking mission with johnny umami now no longer allows you to lose progress by deleting items.	2024-08-11 10:26:25 -07:00
David Markowitz	aaf446fe6e	feat: Add Inventory Brick and Model groups (#1587 ) * Added feature grouping logic * Add saving of brick buckets * Add edge case check for max group count * Use vector for storing groups * Update InventoryComponent.cpp * Update InventoryComponent.h * Update InventoryComponent.h * fix string log format * Update GameMessages.cpp	2024-08-01 23:38:21 -07:00
Gie "Max" Vanommeslaeghe	2c70f1503c	Merge pull request #1616 from DarkflameUniverse/behavior fix: add larger behavior fields for saving	2024-07-17 22:24:52 +02:00
Gie "Max" Vanommeslaeghe	49b4748ed3	Merge pull request #1614 from DarkflameUniverse/tea fix: move mission progression location for racing	2024-07-17 22:24:17 +02:00
Gie "Max" Vanommeslaeghe	ffeb0108d0	Merge pull request #1619 from DarkflameUniverse/shield fix: echo skill cast down to client for some server skills	2024-07-17 22:23:21 +02:00
David Markowitz	c3f6ef5a1d	feat: add admin account creation options from cli (GM level) (#1620 ) * add admin account creation options from cli * use actual gm levels felt under delivered in previous iteration. * Update dMasterServer/MasterServer.cpp Co-authored-by: Daniel Seiler <me@xiphoseer.de> --------- Co-authored-by: Daniel Seiler <me@xiphoseer.de>	2024-07-03 15:37:19 -07:00
David Markowitz	999995b2fb	Merge branch 'main' into shield	2024-07-02 03:14:32 -07:00
Gie "Max" Vanommeslaeghe	84fff7c380	Merge pull request #1621 from DarkflameUniverse/EmosewaMC-patch-10 fix: compiler issue on newer gcc versions	2024-07-02 12:12:30 +02:00
David Markowitz	59c4b35479	Update Preconditions.cpp	2024-07-02 01:55:42 -07:00
David Markowitz	f2d72e7ed5	Update Preconditions.cpp	2024-06-25 21:02:40 -07:00
David Markowitz	b648b43c4d	??	2024-06-25 20:52:46 -07:00
David Markowitz	2628470482	set shield to false, add sync for done	2024-06-18 14:24:03 -07:00
David Markowitz	f82a82f254	Create 16_big_behaviors.sql	2024-06-17 19:41:27 -07:00
Gie "Max" Vanommeslaeghe	9400ee1dc0	Merge pull request #1586 from DarkflameUniverse/property_behavior_saving feat: Property Behavior Saving	2024-06-16 12:31:21 +02:00
David Markowitz	54b8c25754	Merge branch 'main' into tea	2024-06-12 19:20:44 -07:00
David Markowitz	b984cd6a0b	Merge branch 'main' into property_behavior_saving	2024-06-12 19:17:39 -07:00
Gie "Max" Vanommeslaeghe	bcf1058759	Merge pull request #1595 from DarkflameUniverse/issue-462 fix: prevent moving items between inventories under cetain circumsances	2024-06-11 20:48:09 +02:00
David Markowitz	6ad6e930c7	move mission progression done now as soon as you cross the finish line on the last lap instead of after you click "rewards"	2024-06-11 02:29:25 -07:00
David Markowitz	fee0238e79	fix: master not using table data, remove 2 noisy logs (#1613 ) Tested with logs that queries to get soft and hard cap actually succeed now Logs about slash command handler command registration and vanity NPC creation in mis matched worlds are now removed.	2024-06-09 15:31:57 -07:00
Wincent Holm	1454fcd003	Fix g++ 14 (#1610 ) * Fix g++ 14 * Update thirdparty/CMakeLists.txt Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> --------- Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>	2024-06-06 04:00:44 -05:00
Gie "Max" Vanommeslaeghe	af651f0d63	Merge pull request #1608 from DarkflameUniverse/feat--spectate-command feat: spectate command	2024-06-04 09:17:18 +02:00
Aaron Kimbre	ff38503597	no feedback if empty	2024-06-03 22:51:46 -05:00
Aaron Kimbre	3f22bf5cc0	Add an easy way to stop spectating	2024-06-03 22:44:54 -05:00
Aaron Kimbre	9d5d2a68ee	fix gm serialization	2024-06-03 22:30:57 -05:00
Aaron Kimbre	1a14c29c39	add returns, lol	2024-06-03 22:29:21 -05:00
Aaron Kimbre	2ef45bd7ee	use empty	2024-06-03 22:28:37 -05:00
Aaron Kimbre	b56d077892	feat: spectate command	2024-06-03 21:50:12 -05:00
David Markowitz	a54600b41e	busting out the multimap ig (#1602 )	2024-05-31 13:46:18 -05:00
David Markowitz	342da927f5	fix dimantling items from not the model inventory (#1605 )	2024-05-30 23:53:13 -05:00
David Markowitz	01086d05c8	fix: use after free and uninitialized memory (#1603 ) * fix use after free and uninitialized memory * add if check for packet lengths * move purge down further Its used in the if check too...	2024-05-30 23:53:03 -05:00
Remco Hofman	cce5755366	Fix Dockerfile vanity COPY (#1604 ) Corrected an unintended mistake in the COPY commands for adding the vanity files to the Docker container, causing only the last file contents to be added to the file '/app/vanity/*'	2024-05-27 17:46:09 -07:00
TAHuntling	e966d3a644	Chore: split VE script up (#1598 ) * Testing Scripts Testing splitting AgSpaceStuff into AgSpaceStuff and AgShipShake * fixed inclusions * Removed DoShake * cleaning up * consistent if statements * Update dScripts/ai/AG/AgShipShake.h Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> --------- Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>	2024-05-27 01:24:48 -05:00
Gie "Max" Vanommeslaeghe	9328021339	Merge pull request #1600 from DarkflameUniverse/add-missing-scripts fix: add back missing scripts from scripts refactor	2024-05-26 12:02:12 +02:00
Gie "Max" Vanommeslaeghe	d1134fdd62	Merge pull request #1601 from DarkflameUniverse/fix-using-skill-in-race fix: players using non-car skills in a race	2024-05-26 12:01:54 +02:00
David Markowitz	efa658bc31	fix players using non-car skills in a race	2024-05-25 19:59:15 -07:00
David Markowitz	e59525d2ae	Update CppScripts.cpp	2024-05-25 19:32:18 -07:00
David Markowitz	0348db72a5	fiux mission (#1596 )	2024-05-25 12:24:02 -05:00
TAHuntling	debc2a96e2	Update CppScripts exclusion list (#1597 )	2024-05-25 01:43:32 -07:00
Aaron Kimbre	86f335d64b	fix type	2024-05-24 21:43:54 -05:00
Aaron Kimbre	8ca05241f2	fix: prevent moving items between inventories under cetain circumsances	2024-05-24 21:35:14 -05:00
David Markowitz	8ae1a8ff7c	fix stale reference (#1594 )	2024-05-24 09:15:30 -05:00
David Markowitz	db2d4f02b5	preemptive include for windows	2024-05-18 04:16:07 -07:00
David Markowitz	00f36f3f28	missing include for windows	2024-05-18 04:15:07 -07:00
David Markowitz	a50b256689	Update IBehaviors.h	2024-05-18 03:54:09 -07:00
David Markowitz	b3548de7da	debug logs and spacing	2024-05-18 03:52:36 -07:00
David Markowitz	387c37505c	undo debug changes	2024-05-18 03:39:25 -07:00
David Markowitz	0c4108e730	Add loading from database yahoo	2024-05-18 03:36:29 -07:00
David Markowitz	fd1c6ab2ea	Saving actually works this time	2024-05-18 02:12:23 -07:00
David Markowitz	f2bf9a2a28	Saving to database working	2024-05-18 02:05:55 -07:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE behaviors MODIFY behavior_info LONGTEXT DEFAULT NULL;`