Merge branch 'main' into save_data

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);

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;
+}

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

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);
 		}
 	}
 

dGame/dGameMessages/GameMessages.cpp

@@ -99,6 +99,7 @@
 #include "ActivityManager.h"
 #include "PlayerManager.h"
 #include "eVendorTransactionResult.h"
+#include "eReponseMoveItemBetweenInventoryTypeCode.h"
 
 #include "CDComponentsRegistryTable.h"
 #include "CDObjectsTable.h"
@@ -4565,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());
@@ -4583,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;

dGame/dGameMessages/GameMessages.h

@@ -39,6 +39,7 @@ 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,
@@ -594,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);
 

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);
+		}
+	}
+}

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{ "" };

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);
+}

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 };

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);
+	}
+}

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.

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);
+	}
+}

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;
 };

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);
+	}
+}

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;

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);
 

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) {

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;
 				}