Merge branch 'main' into rotation-behaviors

dGame/dGameMessages/DoClientProjectileImpact.h

@@ -61,6 +61,7 @@ public:
 
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (uint32_t k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);

dGame/dGameMessages/EchoStartSkill.h

@@ -100,6 +100,7 @@ public:
 
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (uint32_t k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);

dGame/dGameMessages/EchoSyncSkill.h

@@ -47,6 +47,7 @@ public:
 
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (unsigned int k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);

dGame/dGameMessages/GameMessageHandler.cpp

@@ -61,6 +61,11 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 
 	User* usr = UserManager::Instance()->GetUser(sysAddr);
 
+	if (!usr) {
+		LOG("Failed to find a logged in user for (%llu), aborting GM: %4i, %s!", objectID, messageID, StringifiedEnum::ToString(messageID).data());
+		return;
+	}
+
 	if (!entity) {
 		LOG("Failed to find associated entity (%llu), aborting GM: %4i, %s!", objectID, messageID, StringifiedEnum::ToString(messageID).data());
 		return;
@@ -76,7 +81,8 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 		if (msg->requiredGmLevel > eGameMasterLevel::CIVILIAN) {
 			auto* usingEntity = Game::entityManager->GetEntity(usr->GetLoggedInChar());
 			if (!usingEntity || usingEntity->GetGMLevel() < msg->requiredGmLevel) {
-				LOG("User %s (%llu) does not have the required GM level to execute this command.", usingEntity->GetCharacter()->GetName().c_str(), usingEntity->GetObjectID());
+				if (usingEntity) LOG("User %s (%llu) does not have the required GM level to execute this command.", usingEntity->GetCharacter()->GetName().c_str(), usingEntity->GetObjectID());
+				else LOG("ObjectID %llu tried to use a gm required message.", usr->GetLoggedInChar());
 				return;
 			}
 		}
@@ -153,6 +159,10 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 
 		InventoryComponent* inv = entity->GetComponent<InventoryComponent>();
 		if (inv) {
+			// Clear server-side skill state so AddItemSkills sends fresh AddSkill
+			// packets to the now-ready client. Skills sent during entity construction
+			// (Serialize) arrive before LWOSkillComponent is initialized and are dropped.
+			inv->ClearSkills();
 			auto items = inv->GetEquippedItems();
 			for (auto pair : items) {
 				const auto item = pair.second;
@@ -167,8 +177,8 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 
 		GameMessages::SendRestoreToPostLoadStats(entity, sysAddr);
 
-		auto* destroyable = entity->GetComponent<DestroyableComponent>();
-		destroyable->SetImagination(destroyable->GetImagination());
+		auto* const destroyable = entity->GetComponent<DestroyableComponent>();
+		if (destroyable) destroyable->SetImagination(destroyable->GetImagination());
 		Game::entityManager->SerializeEntity(entity);
 
 		std::vector<Entity*> racingControllers = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::RACING_CONTROL);
@@ -186,7 +196,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 
 		std::vector<Entity*> scriptedActs = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::SCRIPT);
 		for (Entity* scriptEntity : scriptedActs) {
-			if (scriptEntity->GetObjectID() != zoneControl->GetObjectID()) { // Don't want to trigger twice on instance worlds
+			if (!zoneControl || scriptEntity->GetObjectID() != zoneControl->GetObjectID()) { // Don't want to trigger twice on instance worlds
 				scriptEntity->GetScript()->OnPlayerLoaded(scriptEntity, entity);
 			}
 		}
@@ -332,9 +342,9 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 		if (behaviorId > 0) {
 			auto bs = RakNet::BitStream(reinterpret_cast<unsigned char*>(&startSkill.sBitStream[0]), startSkill.sBitStream.size(), false);
 
-			auto* skillComponent = entity->GetComponent<SkillComponent>();
+			auto* const skillComponent = entity->GetComponent<SkillComponent>();
 
-			success = skillComponent->CastPlayerSkill(behaviorId, startSkill.uiSkillHandle, bs, startSkill.optionalTargetID, startSkill.skillID);
+			if (skillComponent) success = skillComponent->CastPlayerSkill(behaviorId, startSkill.uiSkillHandle, bs, startSkill.optionalTargetID, startSkill.skillID);
 
 			if (success && entity->GetCharacter()) {
 				DestroyableComponent* destComp = entity->GetComponent<DestroyableComponent>();
@@ -387,9 +397,9 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
 		if (usr != nullptr) {
 			auto bs = RakNet::BitStream(reinterpret_cast<unsigned char*>(&sync.sBitStream[0]), sync.sBitStream.size(), false);
 
-			auto* skillComponent = entity->GetComponent<SkillComponent>();
+			auto* const skillComponent = entity->GetComponent<SkillComponent>();
 
-			skillComponent->SyncPlayerSkill(sync.uiSkillHandle, sync.uiBehaviorHandle, bs);
+			if (skillComponent) skillComponent->SyncPlayerSkill(sync.uiSkillHandle, sync.uiBehaviorHandle, bs);
 		}
 
 		EchoSyncSkill echo = EchoSyncSkill();

dGame/dGameMessages/GameMessages.cpp

@@ -46,6 +46,7 @@
 #include <sstream>
 #include <future>
 #include <chrono>
+#include <ranges>
 #include "RakString.h"
 
 //CDB includes:
@@ -365,18 +366,19 @@ void GameMessages::SendResetMissions(Entity* entity, const SystemAddress& sysAdd
 
 void GameMessages::SendPlatformResync(Entity* entity, const SystemAddress& sysAddr, bool bStopAtDesiredWaypoint,
 	int iIndex, int iDesiredWaypointIndex, int nextIndex,
-	eMovementPlatformState movementState) {
+	eMovementPlatformState movementState, bool special) {
 	CBITSTREAM;
 	CMSGHEADER;
 
+	const auto objID = entity->GetObjectID();
 	const auto lot = entity->GetLOT();
 
-	if (lot == 12341 || lot == 5027 || lot == 5028 || lot == 14335 || lot == 14447 || lot == 14449 || lot == 11306 || lot == 11308) {
+	if (lot == 12341 || lot == 5027 || lot == 5028 || lot == 14335 || lot == 14447 || lot == 14449 || lot == 11306 || lot == 11308 || lot == 9483) {
 		iDesiredWaypointIndex = (lot == 11306 || lot == 11308) ? 1 : 0;
-		iIndex = 0;
-		nextIndex = 0;
+		iIndex = lot == 9483 ? 1 : 0;
+		nextIndex = lot == 9483 && !special ? 1 : 0;
 		bStopAtDesiredWaypoint = true;
-		movementState = eMovementPlatformState::Stationary;
+		movementState = lot == 9483 && !special ? eMovementPlatformState::Stopped : eMovementPlatformState::Stationary;
 	}
 
 	bitStream.Write(entity->GetObjectID());
@@ -465,20 +467,20 @@ void GameMessages::SendAddItemToInventoryClientSync(Entity* entity, const System
 
 	bitStream.Write(lootSourceType != eLootSourceType::NONE); // Loot source
 	if (lootSourceType != eLootSourceType::NONE) bitStream.Write(lootSourceType);
-	LWONameValue extraInfo;
+	std::u16string extraInfo;
 
-	auto config = item->GetConfig();
+	const auto& config = item->GetConfig();
 
-	for (auto* data : config) {
-		extraInfo.name += GeneralUtils::ASCIIToUTF16(data->GetString()) + u",";
+	for (const auto& data : config.values | std::views::values) {
+		extraInfo += GeneralUtils::ASCIIToUTF16(data->GetString()) + u",";
 	}
 
-	if (extraInfo.name.length() > 0) extraInfo.name.pop_back(); // remove the last comma
+	if (extraInfo.length() > 0) extraInfo.pop_back(); // remove the last comma
 
-	bitStream.Write<uint32_t>(extraInfo.name.size());
-	if (extraInfo.name.size() > 0) {
-		for (uint32_t i = 0; i < extraInfo.name.size(); ++i) {
-			bitStream.Write<uint16_t>(extraInfo.name[i]);
+	bitStream.Write<uint32_t>(extraInfo.size());
+	if (extraInfo.size() > 0) {
+		for (uint32_t i = 0; i < extraInfo.size(); ++i) {
+			bitStream.Write<uint16_t>(extraInfo[i]);
 		}
 		bitStream.Write<uint16_t>(0x00);
 	}
@@ -743,13 +745,9 @@ void GameMessages::SendBroadcastTextToChatbox(Entity* entity, const SystemAddres
 	bitStream.Write(entity->GetObjectID());
 	bitStream.Write(MessageType::Game::BROADCAST_TEXT_TO_CHATBOX);
 
-	LWONameValue attribs;
-	attribs.name = attrs;
-	attribs.length = attrs.size();
-
-	bitStream.Write<uint32_t>(attribs.length);
-	for (uint32_t i = 0; i < attribs.length; ++i) {
-		bitStream.Write<uint16_t>(attribs.name[i]);
+	bitStream.Write<uint32_t>(attrs.size());
+	for (uint32_t i = 0; i < attrs.size(); ++i) {
+		bitStream.Write<uint16_t>(attrs[i]);
 	}
 	bitStream.Write<uint16_t>(0x00); // Null Terminator
 
@@ -1847,18 +1845,6 @@ void GameMessages::SendNotifyClientFailedPrecondition(LWOOBJID objectId, const S
 	SEND_PACKET;
 }
 
-void GameMessages::SendToggleGMInvis(LWOOBJID objectId, bool enabled, const SystemAddress& sysAddr) {
-	CBITSTREAM;
-	CMSGHEADER;
-
-	bitStream.Write(objectId);
-	bitStream.Write(MessageType::Game::TOGGLE_GM_INVIS);
-	bitStream.Write(enabled); // does not matter?
-
-	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
-	SEND_PACKET;
-}
-
 void GameMessages::SendSetName(LWOOBJID objectID, std::u16string name, const SystemAddress& sysAddr) {
 	CBITSTREAM;
 	CMSGHEADER;
@@ -2149,6 +2135,7 @@ void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream&
 	inStream.Read(worldId);
 
 	inStream.Read(descriptionLength);
+	if (descriptionLength > MAX_MESSAGE_LENGTH) return;
 	for (uint32_t i = 0; i < descriptionLength; ++i) {
 		uint16_t character;
 		inStream.Read(character);
@@ -2156,6 +2143,7 @@ void GameMessages::HandleUpdatePropertyOrModelForFilterCheck(RakNet::BitStream&
 	}
 
 	inStream.Read(nameLength);
+	if (nameLength > MAX_MESSAGE_LENGTH) return;
 	for (uint32_t i = 0; i < nameLength; ++i) {
 		uint16_t character;
 		inStream.Read(character);
@@ -2417,12 +2405,26 @@ void GameMessages::SendUnSmash(Entity* entity, LWOOBJID builderID, float duratio
 
 void GameMessages::HandleControlBehaviors(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
 	AMFDeserialize reader;
-	std::unique_ptr<AMFArrayValue> amfArguments{ static_cast<AMFArrayValue*>(reader.Read(inStream).release()) };
+	std::unique_ptr<AMFArrayValue> amfArguments;
+	try {
+		auto deserializedData = reader.Read(inStream);
+		if (!deserializedData || deserializedData->GetValueType() != eAmf::Array) {
+			LOG("Failed to deserialize AMF data for control behaviors command: not an array");
+			return;
+		}
+
+		amfArguments.reset(static_cast<AMFArrayValue*>(deserializedData.release()));
+	} catch (...) {
+		LOG("Failed to deserialize AMF data for control behaviors command");
+		return;
+	}
 	if (amfArguments->GetValueType() != eAmf::Array) return;
 
 	uint32_t commandLength{};
 	inStream.Read(commandLength);
 
+	if (commandLength > MAX_MESSAGE_LENGTH) return; // Prevent DoS via unbounded command buffer
+
 	std::string command;
 	command.reserve(commandLength);
 	for (uint32_t i = 0; i < commandLength; ++i) {
@@ -2472,9 +2474,15 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream& inStream, Entity* ent
 
 	uint32_t sd0Size;
 	inStream.Read(sd0Size);
-	std::unique_ptr<char[]> sd0Data(new char[sd0Size]);
 
-	if (sd0Data == nullptr) return;
+	// For the sake of letting players make models as big as they want, only reject if we cant allocate the required memory.
+	std::unique_ptr<char[]> sd0Data;
+	try {
+		sd0Data.reset(new char[sd0Size]);
+	} catch (std::exception& e) {
+		LOG("Failed to allocate sd0 of size %u", sd0Size);
+		return;
+	}
 
 	inStream.ReadAlignedBytes(reinterpret_cast<unsigned char*>(sd0Data.get()), sd0Size);
 
@@ -2611,11 +2619,11 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream& inStream, Entity* ent
 		info.spawnerID = entity->GetObjectID();
 		info.spawnerNodeID = 0;
 
-		info.settings.push_back(new LDFData<LWOOBJID>(u"blueprintid", blueprintIDs[i]));
-		info.settings.push_back(new LDFData<int>(u"componentWhitelist", 1));
-		info.settings.push_back(new LDFData<int>(u"modelType", 2));
-		info.settings.push_back(new LDFData<bool>(u"propertyObjectID", true));
-		info.settings.push_back(new LDFData<LWOOBJID>(u"userModelID", modelIDs[i]));
+		info.settings.Insert<LWOOBJID>(u"blueprintid", blueprintIDs[i]);
+		info.settings.Insert<int>(u"componentWhitelist", 1);
+		info.settings.Insert<int>(u"modelType", 2);
+		info.settings.Insert<bool>(u"propertyObjectID", true);
+		info.settings.Insert<LWOOBJID>(u"userModelID", modelIDs[i]);
 		Entity* newEntity = Game::entityManager->CreateEntity(info, nullptr);
 		if (newEntity) {
 			Game::entityManager->ConstructEntity(newEntity);
@@ -2650,6 +2658,7 @@ void GameMessages::HandlePropertyEntranceSync(RakNet::BitStream& inStream, Entit
 	inStream.Read(startIndex);
 	inStream.Read(filterTextLength);
 
+	if (filterTextLength > MAX_MESSAGE_LENGTH) return;
 	for (auto i = 0u; i < filterTextLength; i++) {
 		char c;
 		inStream.Read(c);
@@ -3038,6 +3047,7 @@ void GameMessages::HandleVerifyAck(RakNet::BitStream& inStream, Entity* entity,
 
 	uint32_t sBitStreamLength = 0;
 	inStream.Read(sBitStreamLength);
+	if (sBitStreamLength > MAX_MESSAGE_LENGTH) return;
 	for (uint64_t k = 0; k < sBitStreamLength; k++) {
 		uint8_t character;
 		inStream.Read(character);
@@ -3209,7 +3219,7 @@ void GameMessages::HandleClientTradeRequest(RakNet::BitStream& inStream, Entity*
 
 		LOG("Trade request to (%llu)", i64Invitee);
 
-		auto* trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
+		const auto& trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
 
 		if (trade != nullptr) {
 			if (!trade->IsParticipant(i64Invitee)) {
@@ -3232,7 +3242,7 @@ void GameMessages::HandleClientTradeRequest(RakNet::BitStream& inStream, Entity*
 }
 
 void GameMessages::HandleClientTradeCancel(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
-	auto* trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
+	const auto& trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
 
 	if (trade == nullptr) return;
 
@@ -3246,7 +3256,7 @@ void GameMessages::HandleClientTradeAccept(RakNet::BitStream& inStream, Entity*
 
 	LOG("Trade accepted from (%llu) -> (%d)", entity->GetObjectID(), bFirst);
 
-	auto* trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
+	const auto& trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
 
 	if (trade == nullptr) return;
 
@@ -3259,6 +3269,7 @@ void GameMessages::HandleClientTradeUpdate(RakNet::BitStream& inStream, Entity*
 
 	inStream.Read(currency);
 	inStream.Read(itemCount);
+	if (itemCount > MAX_MESSAGE_LENGTH) return;
 
 	LOG("Trade update from (%llu) -> (%llu), (%i)", entity->GetObjectID(), currency, itemCount);
 
@@ -3311,7 +3322,7 @@ void GameMessages::HandleClientTradeUpdate(RakNet::BitStream& inStream, Entity*
 		LOG("Trade item from (%llu) -> (%llu)/(%llu), (%i), (%llu), (%i), (%i)", entity->GetObjectID(), itemId, itemId2, lot, unknown1, unknown2, unknown3);
 	}
 
-	auto* trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
+	const auto& trade = TradingManager::Instance()->GetPlayerTrade(entity->GetObjectID());
 
 	if (trade == nullptr) return;
 
@@ -3628,6 +3639,8 @@ void GameMessages::HandlePetTamingTryBuild(RakNet::BitStream& inStream, Entity*
 
 	inStream.Read(brickCount);
 
+	if (brickCount > MAX_MESSAGE_LENGTH) return; // Prevent DoS via unbounded brick count
+
 	bricks.reserve(brickCount);
 
 	for (uint32_t i = 0; i < brickCount; i++) {
@@ -3669,6 +3682,7 @@ void GameMessages::HandleRequestSetPetName(RakNet::BitStream& inStream, Entity*
 
 	inStream.Read(nameLength);
 
+	if (nameLength > MAX_MESSAGE_LENGTH) return;
 	for (size_t i = 0; i < nameLength; i++) {
 		char16_t character;
 		inStream.Read(character);
@@ -3738,6 +3752,7 @@ void GameMessages::HandleMessageBoxResponse(RakNet::BitStream& inStream, Entity*
 	inStream.Read(iButton);
 
 	inStream.Read(identifierLength);
+	if (identifierLength > MAX_MESSAGE_LENGTH) return;
 	for (size_t i = 0; i < identifierLength; i++) {
 		char16_t character;
 		inStream.Read(character);
@@ -3745,6 +3760,7 @@ void GameMessages::HandleMessageBoxResponse(RakNet::BitStream& inStream, Entity*
 	}
 
 	inStream.Read(userDataLength);
+	if (userDataLength > MAX_MESSAGE_LENGTH) return;
 	for (size_t i = 0; i < userDataLength; i++) {
 		char16_t character;
 		inStream.Read(character);
@@ -3792,6 +3808,7 @@ void GameMessages::HandleChoiceBoxRespond(RakNet::BitStream& inStream, Entity* e
 	std::u16string identifier;
 
 	inStream.Read(buttonIdentifierLength);
+	if (buttonIdentifierLength > MAX_MESSAGE_LENGTH) return;
 	for (size_t i = 0; i < buttonIdentifierLength; i++) {
 		char16_t character;
 		inStream.Read(character);
@@ -3801,6 +3818,7 @@ void GameMessages::HandleChoiceBoxRespond(RakNet::BitStream& inStream, Entity* e
 	inStream.Read(iButton);
 
 	inStream.Read(identifierLength);
+	if (identifierLength > MAX_MESSAGE_LENGTH) return;
 	for (size_t i = 0; i < identifierLength; i++) {
 		char16_t character;
 		inStream.Read(character);
@@ -3926,11 +3944,19 @@ void GameMessages::SendSetMountInventoryID(Entity* entity, const LWOOBJID& objec
 	CMSGHEADER;
 	bitStream.Write(entity->GetObjectID());
 	bitStream.Write(MessageType::Game::SET_MOUNT_INVENTORY_ID);
-	bitStream.Write(objectID);
+	bitStream.Write(objectID != LWOOBJID_EMPTY);
+	if (objectID != LWOOBJID_EMPTY) bitStream.Write(objectID);
 
 	SEND_PACKET_BROADCAST;
 }
 
+void GameMessages::UseSkillSet::Serialize(RakNet::BitStream& bitStream) const {
+	bitStream.Write(bRemove);
+	bitStream.Write(possessedId != LWOOBJID_EMPTY);
+	if (possessedId != LWOOBJID_EMPTY) bitStream.Write(possessedId);
+	bitStream.Write(setId != -1);
+	if (setId != -1) bitStream.Write(setId);
+}
 
 void GameMessages::HandleDismountComplete(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
 	// Get the objectID from the bitstream
@@ -3966,9 +3992,6 @@ void GameMessages::HandleDismountComplete(RakNet::BitStream& inStream, Entity* e
 
 			// Update the entity that was possessing
 			Game::entityManager->SerializeEntity(entity);
-
-			// We aren't mounted so remove the stun
-			GameMessages::SendSetStunned(entity->GetObjectID(), eStateChangeType::POP, UNASSIGNED_SYSTEM_ADDRESS, LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
 		}
 	}
 }
@@ -3976,10 +3999,14 @@ void GameMessages::HandleDismountComplete(RakNet::BitStream& inStream, Entity* e
 
 void GameMessages::HandleAcknowledgePossession(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
 	Game::entityManager->SerializeEntity(entity);
-	LWOOBJID objectId{};
-	inStream.Read(objectId);
-	auto* mount = Game::entityManager->GetEntity(objectId);
-	if (mount) Game::entityManager->SerializeEntity(mount);
+	bool hasObjectId{};
+	inStream.Read(hasObjectId);
+	if (hasObjectId) {
+		LWOOBJID objectId{};
+		inStream.Read(objectId);
+		auto* mount = Game::entityManager->GetEntity(objectId);
+		if (mount) Game::entityManager->SerializeEntity(mount);
+	}
 }
 
 //Racing
@@ -4154,7 +4181,13 @@ void GameMessages::HandleUpdatePropertyPerformanceCost(RakNet::BitStream& inStre
 		return;
 	}
 
-	Database::Get()->UpdatePerformanceCost(zone->GetZoneID(), performanceCost);
+	const auto* const propertyManagementComponent = entity->GetComponent<PropertyManagementComponent>();
+	const auto* const ownerEntity = propertyManagementComponent ? propertyManagementComponent->GetOwner() : nullptr;
+	const auto* const character = ownerEntity ? ownerEntity->GetCharacter() : nullptr;
+	const auto& zoneID = zone->GetZoneID();
+	if (character && character->GetPropertyCloneID() == zoneID.GetCloneID()) {
+		Database::Get()->UpdatePerformanceCost(zoneID, performanceCost);
+	}
 }
 
 void GameMessages::HandleVehicleNotifyHitImaginationServer(RakNet::BitStream& inStream, Entity* entity, const SystemAddress& sysAddr) {
@@ -4779,13 +4812,19 @@ void GameMessages::HandleParseChatMessage(RakNet::BitStream& inStream, Entity* e
 
 	uint32_t wsStringLength;
 	inStream.Read(wsStringLength);
+
+	if (wsStringLength > MAX_MESSAGE_LENGTH) {
+		LOG("Max message length reached, capping message.");
+		wsStringLength = MAX_MESSAGE_LENGTH;
+	}
+
 	for (uint32_t i = 0; i < wsStringLength; ++i) {
 		uint16_t character;
 		inStream.Read(character);
 		wsString.push_back(character);
 	}
 
-	if (wsString[0] == L'/') {
+	if (!wsString.empty() && wsString[0] == L'/') {
 		SlashCommandHandler::HandleChatCommand(wsString, entity, sysAddr);
 	}
 }
@@ -4802,6 +4841,7 @@ void GameMessages::HandleFireEventServerSide(RakNet::BitStream& inStream, Entity
 	LWOOBJID senderID{};
 
 	inStream.Read(argsLength);
+	if (argsLength > MAX_MESSAGE_LENGTH) return;
 	for (uint32_t i = 0; i < argsLength; ++i) {
 		uint16_t character;
 		inStream.Read(character);
@@ -5233,7 +5273,8 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream& inStream, En
 	int eInvType = INVENTORY_MAX;
 	bool eLootTypeSourceIsDefault = false;
 	int eLootTypeSource = LOOTTYPE_NONE;
-	LWONameValue extraInfo;
+	int32_t extraInfoLength = 0;
+	std::u16string extraInfo;
 	bool forceDeletion = true;
 	bool iLootTypeSourceIsDefault = false;
 	LWOOBJID iLootTypeSource = LWOOBJID_EMPTY;
@@ -5259,12 +5300,12 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream& inStream, En
 	if (eInvTypeIsDefault) inStream.Read(eInvType);
 	inStream.Read(eLootTypeSourceIsDefault);
 	if (eLootTypeSourceIsDefault) inStream.Read(eLootTypeSource);
-	inStream.Read(extraInfo.length);
-	if (extraInfo.length > 0) {
-		for (uint32_t i = 0; i < extraInfo.length; ++i) {
+	inStream.Read(extraInfoLength);
+	if (extraInfoLength > 0) {
+		for (uint32_t i = 0; i < extraInfoLength; ++i) {
 			uint16_t character;
 			inStream.Read(character);
-			extraInfo.name.push_back(character);
+			extraInfo.push_back(character);
 		}
 		uint16_t nullTerm;
 		inStream.Read(nullTerm);
@@ -5432,7 +5473,7 @@ void GameMessages::HandleModularBuildFinish(RakNet::BitStream& inStream, Entity*
 	std::vector<LOT> modList;
 	auto& oldPartList = character->GetVar<std::string>(u"currentModifiedBuild");
 	bool everyPieceSwapped = !oldPartList.empty(); // If the player didn't put a build in initially, then they should not get this achievement.
-	if (count >= 3) {
+	if (count >= 3 && count < 8) {
 		std::u16string modules;
 
 		for (uint32_t k = 0; k < count; k++) {
@@ -5472,10 +5513,8 @@ void GameMessages::HandleModularBuildFinish(RakNet::BitStream& inStream, Entity*
 		//inv->UnequipItem(inv->GetItemStackByLOT(6086, eInventoryType::ITEMS)); // take off the thinking cap
 		//Game::entityManager->SerializeEntity(entity);
 
-		const auto moduleAssembly = new LDFData<std::u16string>(u"assemblyPartLOTs", modules);
-
-		std::vector<LDFBaseData*> config;
-		config.push_back(moduleAssembly);
+		LwoNameValue config;
+		config.Insert(u"assemblyPartLOTs", modules);
 
 		LWOOBJID newID = ObjectIDManager::GetPersistentID();
 
@@ -5721,7 +5760,6 @@ void GameMessages::HandleUseNonEquipmentItem(RakNet::BitStream& inStream, Entity
 
 void GameMessages::HandleMatchRequest(RakNet::BitStream& inStream, Entity* entity) {
 	LWOOBJID activator;
-	//std::map<LWOOBJID, LWONameValue> additionalPlayers;
 	uint32_t playerChoicesLen;
 	std::string playerChoices;
 	int type;
@@ -5729,6 +5767,7 @@ void GameMessages::HandleMatchRequest(RakNet::BitStream& inStream, Entity* entit
 
 	inStream.Read(activator);
 	inStream.Read(playerChoicesLen);
+	if (playerChoicesLen > MAX_MESSAGE_LENGTH) return;
 	for (uint32_t i = 0; i < playerChoicesLen; ++i) {
 		uint16_t character;
 		inStream.Read(character);
@@ -5818,6 +5857,8 @@ void GameMessages::HandleReportBug(RakNet::BitStream& inStream, Entity* entity)
 	uint32_t messageLength;
 	inStream.Read(messageLength);
 
+	if (messageLength > MAX_MESSAGE_LENGTH) return;
+
 	for (uint32_t i = 0; i < (messageLength); ++i) {
 		uint16_t character;
 		inStream.Read(character);
@@ -5829,6 +5870,7 @@ void GameMessages::HandleReportBug(RakNet::BitStream& inStream, Entity* entity)
 
 	uint32_t clientVersionLength;
 	inStream.Read(clientVersionLength);
+	if (clientVersionLength > MAX_MESSAGE_LENGTH) return;
 	for (unsigned int k = 0; k < clientVersionLength; k++) {
 		unsigned char character;
 		inStream.Read(character);
@@ -5837,6 +5879,7 @@ void GameMessages::HandleReportBug(RakNet::BitStream& inStream, Entity* entity)
 
 	uint32_t nOtherPlayerIDLength;
 	inStream.Read(nOtherPlayerIDLength);
+	if (nOtherPlayerIDLength > MAX_MESSAGE_LENGTH) return;
 	for (unsigned int k = 0; k < nOtherPlayerIDLength; k++) {
 		unsigned char character;
 		inStream.Read(character);
@@ -5845,6 +5888,7 @@ void GameMessages::HandleReportBug(RakNet::BitStream& inStream, Entity* entity)
 
 	uint32_t selectionLength;
 	inStream.Read(selectionLength);
+	if (selectionLength > MAX_MESSAGE_LENGTH) return;
 	for (unsigned int k = 0; k < selectionLength; k++) {
 		unsigned char character;
 		inStream.Read(character);
@@ -5881,7 +5925,7 @@ void GameMessages::HandlePlayerRailArrivedNotification(RakNet::BitStream& inStre
 	const SystemAddress& sysAddr) {
 	uint32_t pathNameLength;
 	inStream.Read(pathNameLength);
-
+	if (pathNameLength > MAX_MESSAGE_LENGTH) return;
 	std::u16string pathName;
 	for (auto k = 0; k < pathNameLength; k++) {
 		uint16_t c;
@@ -5943,6 +5987,7 @@ void GameMessages::HandleUpdatePlayerStatistic(RakNet::BitStream& inStream, Enti
 void GameMessages::HandleDeactivateBubbleBuff(RakNet::BitStream& inStream, Entity* entity) {
 	auto controllablePhysicsComponent = entity->GetComponent<ControllablePhysicsComponent>();
 	if (controllablePhysicsComponent) controllablePhysicsComponent->DeactivateBubbleBuff();
+	GameMessages::SendDeactivateBubbleBuffFromServer(entity->GetObjectID(), entity->GetSystemAddress());
 }
 
 void GameMessages::HandleActivateBubbleBuff(RakNet::BitStream& inStream, Entity* entity) {
@@ -6146,14 +6191,17 @@ void GameMessages::HandleUpdateInventoryGroup(RakNet::BitStream& inStream, Entit
 
 	uint32_t size{};
 	if (!inStream.Read(size)) return;
+	if (size > MAX_MESSAGE_LENGTH) return; // Bounds check before resize
 	action.resize(size);
 	if (!inStream.Read(action.data(), size)) return;
 
 	if (!inStream.Read(size)) return;
+	if (size > MAX_MESSAGE_LENGTH) return; // Bounds check before resize
 	groupUpdate.groupId.resize(size);
 	if (!inStream.Read(groupUpdate.groupId.data(), size)) return;
 
 	if (!inStream.Read(size)) return;
+	if (size > MAX_MESSAGE_LENGTH / 2) return; // Bounds check: size * 2 would overflow or exceed limit
 	groupName.resize(size);
 	if (!inStream.Read(reinterpret_cast<char*>(groupName.data()), size * 2)) return;
 
@@ -6266,7 +6314,7 @@ namespace GameMessages {
 		bitStream.Write(id);
 
 		std::string toWrite;
-		for (const auto* item : localizeParams) {
+		for (const auto& item : localizeParams | std::views::values) {
 			toWrite += item->GetString() + "\n";
 		}
 		if (!toWrite.empty()) toWrite.pop_back();
@@ -6446,7 +6494,11 @@ namespace GameMessages {
 	}
 
 	void TeamPickupItem::Serialize(RakNet::BitStream& stream) const {
-		stream.Write(lootID);	
-		stream.Write(lootOwnerID);	
+		stream.Write(lootID);
+		stream.Write(lootOwnerID);
+	}
+
+	void ToggleGMInvis::Serialize(RakNet::BitStream& stream) const {
+		stream.Write(bStateOut);
 	}
 }

dGame/dGameMessages/GameMessages.h

@@ -13,6 +13,7 @@
 #include "Brick.h"
 #include "MessageType/Game.h"
 #include "eGameMasterLevel.h"
+#include "LDFFormat.h"
 
 class AMFBaseValue;
 class AMFArrayValue;
@@ -44,6 +45,7 @@ enum class BehaviorSlot : int32_t;
 enum class eVendorTransactionResult : uint32_t;
 enum class eReponseMoveItemBetweenInventoryTypeCode : int32_t;
 enum class eMissionState : int;
+enum class AiState : uint32_t;
 
 enum class eCameraTargetCyclingMode : int32_t {
 	ALLOW_CYCLE_TEAMMATES,
@@ -102,9 +104,11 @@ namespace GameMessages {
 	void SendPlayNDAudioEmitter(Entity* entity, const SystemAddress& sysAddr, std::string audioGUID);
 
 	void SendStartPathing(Entity* entity);
+
+	// special is for the FV tree platform, feature is complete if we just do that so meh
 	void SendPlatformResync(Entity* entity, const SystemAddress& sysAddr, bool bStopAtDesiredWaypoint = false,
 		int iIndex = 0, int iDesiredWaypointIndex = 1, int nextIndex = 1,
-		eMovementPlatformState movementState = eMovementPlatformState::Moving);
+		eMovementPlatformState movementState = eMovementPlatformState::Moving, bool special = false);
 
 	void SendResetMissions(Entity* entity, const SystemAddress& sysAddr, const int32_t missionid = -1);
 	void SendRestoreToPostLoadStats(Entity* entity, const SystemAddress& sysAddr);
@@ -243,8 +247,6 @@ namespace GameMessages {
 		bool cancelOnLogout = false, bool cancelOnRemoveBuff = true, bool cancelOnUi = false,
 		bool cancelOnUnequip = false, bool cancelOnZone = false, bool addedByTeammate = false, bool applyOnTeammates = false, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS);
 
-	void SendToggleGMInvis(LWOOBJID objectId, bool enabled, const SystemAddress& sysAddr);
-
 	void SendSetName(LWOOBJID objectID, std::u16string name, const SystemAddress& sysAddr);
 
 	// Property messages
@@ -713,7 +715,7 @@ namespace GameMessages {
 		bool translate{};
 		int32_t time{};
 		std::u16string id{};
-		std::vector<LDFBaseData*> localizeParams{};
+		LwoNameValue localizeParams{};
 		std::u16string imageName{};
 		std::u16string text{};
 		void Serialize(RakNet::BitStream& bitStream) const override;
@@ -736,7 +738,7 @@ namespace GameMessages {
 
 	struct ConfigureRacingControl : public GameMsg {
 		ConfigureRacingControl() : GameMsg(MessageType::Game::CONFIGURE_RACING_CONTROL) {}
-		std::vector<std::unique_ptr<LDFBaseData>> racingSettings{};
+		LwoNameValue racingSettings{};
 	};
 
 	struct SetModelToBuild : public GameMsg {
@@ -756,7 +758,7 @@ namespace GameMessages {
 	struct ActivityNotify : public GameMsg {
 		ActivityNotify() : GameMsg(MessageType::Game::ACTIVITY_NOTIFY) {}
 
-		std::vector<std::unique_ptr<LDFBaseData>> notification{};
+		LwoNameValue notification{};
 	};
 
 	struct ShootingGalleryFire : public GameMsg {
@@ -848,6 +850,11 @@ namespace GameMessages {
 
 	struct ResetModelToDefaults : public GameMsg {
 		ResetModelToDefaults() : GameMsg(MessageType::Game::RESET_MODEL_TO_DEFAULTS) {}
+
+		bool bResetPos{ true };
+		bool bResetRot{ true };
+		bool bUnSmash{ true };
+		bool bResetBehaviors{ true };
 	};
 
 	struct EmotePlayed : public GameMsg {
@@ -948,5 +955,54 @@ namespace GameMessages {
 		LWOOBJID lootID{};
 		LWOOBJID lootOwnerID{};
 	};
+
+	struct IsDead : public GameMsg {
+		IsDead() : GameMsg(MessageType::Game::IS_DEAD) {}
+
+		bool bDead{};
+	};
+
+	struct ToggleGMInvis : public GameMsg {
+		ToggleGMInvis() : GameMsg(MessageType::Game::TOGGLE_GM_INVIS) {}
+
+		void Serialize(RakNet::BitStream& stream) const override;
+		bool bStateOut{ false };
+
+	};
+
+	struct GetGMInvis : public GameMsg {
+		GetGMInvis() : GameMsg(MessageType::Game::GET_GM_INVIS) {}
+
+		bool bGMInvis{ false };
+  };
+
+	struct ChildRemoved : public GameMsg {
+		ChildRemoved() : GameMsg(MessageType::Game::CHILD_REMOVED) {}
+
+		LWOOBJID childID{};
+	};
+
+	struct UseSkillSet : public GameMsg {
+		UseSkillSet() : GameMsg(MessageType::Game::USE_SKILL_SET) {}
+		void Serialize(RakNet::BitStream& bitStream) const override;
+
+		bool bRemove{};
+		LWOOBJID possessedId{ LWOOBJID_EMPTY };
+		int32_t setId{ -1 };
+	};
+
+	struct ObjectLoaded : public GameMsg {
+		ObjectLoaded() : GameMsg(MessageType::Game::OBJECT_LOADED) {}
+
+		LWOOBJID objectID{};
+		LOT lot{};
+	};
+
+	struct NotifyCombatAIStateChange : public GameMsg {
+		NotifyCombatAIStateChange() : GameMsg(MessageType::Game::NOTIFY_COMBAT_AI_STATE_CHANGE) {}
+
+		AiState newState{};
+		AiState prevState{};
+	};
 };
 #endif // GAMEMESSAGES_H

dGame/dGameMessages/RequestServerProjectileImpact.h

@@ -54,6 +54,7 @@ public:
 
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (uint32_t k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);

dGame/dGameMessages/StartSkill.h

@@ -111,6 +111,7 @@ public:
 
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (uint32_t k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);

dGame/dGameMessages/SyncSkill.h

@@ -46,6 +46,7 @@ public:
 		stream.Read(bDone);
 		uint32_t sBitStreamLength{};
 		stream.Read(sBitStreamLength);
+		if (sBitStreamLength > MAX_MESSAGE_LENGTH) return false;
 		for (uint32_t k = 0; k < sBitStreamLength; k++) {
 			unsigned char character;
 			stream.Read(character);