Script: Fix incorrect kill method

README.md

@@ -224,44 +224,6 @@ sudo setcap 'cap_net_bind_service=+ep' AuthServer
 ```
 and then go to `build/masterconfig.ini` and change `use_sudo_auth` to 0.
 
-### Linux Service
-If you are running this on a linux based system, it will use your terminal to run the program interactively, preventing you using it for other tasks and requiring it to be open to run the server.  
-_Note: You could use screen or tmux instead for virtual terminals_  
-To run the server non-interactively, we can use a systemctl service by copying the following file:  
-```shell
-cp ./systemd.example /etc/systemd/system/darkflame.service
-```  
-
-Make sure to edit the file in `/etc/systemd/system/darkflame.service` and change the:  
-- `User` and `Group` to the user that runs the darkflame server.  
-- `ExecPath` to the full file path of the server executable.  
-
-To register, enable and start the service use the following commands:
-
-- Reload the systemd manager configuration to make it aware of the new service file:
-```shell
-systemctl daemon-reload
-```
-- Start the service:
-```shell
-systemctl start darkflame.service
-```
-- Enable OR disable the service to start on boot using:
-```shell
-systemctl enable darkflame.service
-systemctl disable darkflame.service
-```
-- Verify that the service is running without errors:
-```shell
-systemctl status darkflame.service
-```
-- You can also restart, stop, or check the logs of the service using journalctl
-```shell
-systemctl restart darkflame.service
-systemctl stop darkflame.service
-journalctl -xeu darkflame.service
-```
-
 ### First admin user
 Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!
 
@@ -323,7 +285,6 @@ Below are known good SHA256 checksums of the client:
 * `0d862f71eedcadc4494c4358261669721b40b2131101cbd6ef476c5a6ec6775b` (unpacked client, includes extra locales, rar compressed)
 
 If the returned hash matches one of the lines above then you can continue with setting up the server. If you are using a fully downloaded and complete client from live, then it will work, but the hash above may not match. Otherwise you must obtain a full install of LEGO® Universe 1.10.64.
-You must also make absolutely sure your LEGO Universe client is not in a Windows OneDrive. DLU is not and will not support a client being stored in a OneDrive, so ensure you have moved the client outside of that location.
 
 ### Darkflame Universe Client
 Darkflame Universe clients identify themselves using a higher version number than the regular live clients out there.

dChatFilter/dChatFilter.cpp

@@ -144,7 +144,7 @@ std::vector<std::pair<uint8_t, uint8_t>> dChatFilter::IsSentenceOkay(const std::
 			listOfBadSegments.emplace_back(position, originalSegment.length());
 		}
 
-		position += originalSegment.length() + 1;
+		position += segment.length() + 1;
 	}
 
 	return listOfBadSegments;

dCommon/dConfig.cpp

@@ -38,11 +38,13 @@ const std::string& dConfig::GetValue(std::string key) {
 }
 
 void dConfig::ProcessLine(const std::string& line) {
-	auto splitLoc = line.find('=');
-	auto key = line.substr(0, splitLoc);
-	auto value = line.substr(splitLoc + 1);
+	auto splitLine = GeneralUtils::SplitString(line, '=');
+
+	if (splitLine.size() != 2) return;
 
 	//Make sure that on Linux, we remove special characters:
+	auto& key = splitLine.at(0);
+	auto& value = splitLine.at(1);
 	if (!value.empty() && value.at(value.size() - 1) == '\r') value.erase(value.size() - 1);
 
 	if (this->m_ConfigValues.find(key) != this->m_ConfigValues.end()) return;

dCommon/dEnums/eWorldMessageType.h

@@ -36,8 +36,7 @@ enum class eWorldMessageType : uint32_t {
 	HANDLE_FUNNESS,
 	FAKE_PRG_CSR_MESSAGE,
 	REQUEST_FREE_TRIAL_REFRESH,
-	GM_SET_FREE_TRIAL_STATUS,
-	UI_HELP_TOP_5 = 91
+	GM_SET_FREE_TRIAL_STATUS
 };
 
 #endif  //!__EWORLDMESSAGETYPE__H__

dDatabase/Tables/CDZoneTableTable.cpp

@@ -31,7 +31,7 @@ void CDZoneTableTable::LoadValuesFromDatabase() {
 		entry.smashableMaxDistance = tableData.getFloatField("smashableMaxDistance", -1.0f);
 		UNUSED(entry.mixerProgram = tableData.getStringField("mixerProgram", ""));
 		UNUSED(entry.clientPhysicsFramerate = tableData.getStringField("clientPhysicsFramerate", ""));
-		entry.serverPhysicsFramerate = tableData.getStringField("serverPhysicsFramerate", "");
+		UNUSED(entry.serverPhysicsFramerate = tableData.getStringField("serverPhysicsFramerate", ""));
 		entry.zoneControlTemplate = tableData.getIntField("zoneControlTemplate", -1);
 		entry.widthInChunks = tableData.getIntField("widthInChunks", -1);
 		entry.heightInChunks = tableData.getIntField("heightInChunks", -1);
@@ -40,10 +40,10 @@ void CDZoneTableTable::LoadValuesFromDatabase() {
 		entry.fZoneWeight = tableData.getFloatField("fZoneWeight", -1.0f);
 		UNUSED(entry.thumbnail = tableData.getStringField("thumbnail", ""));
 		entry.PlayerLoseCoinsOnDeath = tableData.getIntField("PlayerLoseCoinsOnDeath", -1) == 1 ? true : false;
-		entry.disableSaveLoc = tableData.getIntField("disableSaveLoc", -1) == 1 ? true : false;
+		UNUSED(entry.disableSaveLoc = tableData.getIntField("disableSaveLoc", -1) == 1 ? true : false);
 		entry.teamRadius = tableData.getFloatField("teamRadius", -1.0f);
 		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
-		entry.mountsAllowed = tableData.getIntField("mountsAllowed", -1) == 1 ? true : false;
+		UNUSED(entry.mountsAllowed = tableData.getIntField("mountsAllowed", -1) == 1 ? true : false);
 
 		this->m_Entries.insert(std::make_pair(entry.zoneID, entry));
 		tableData.nextRow();

dDatabase/Tables/CDZoneTableTable.h

@@ -18,7 +18,7 @@ struct CDZoneTable {
 	float smashableMaxDistance;         //!< The maximum smashable distance?
 	UNUSED(std::string mixerProgram);              //!< ???
 	UNUSED(std::string clientPhysicsFramerate);    //!< The client physics framerate
-	std::string serverPhysicsFramerate;    //!< The server physics framerate
+	UNUSED(std::string serverPhysicsFramerate);    //!< The server physics framerate
 	unsigned int zoneControlTemplate;           //!< The Zone Control template
 	unsigned int widthInChunks;                 //!< The width of the world in chunks
 	unsigned int heightInChunks;                //!< The height of the world in chunks
@@ -27,10 +27,10 @@ struct CDZoneTable {
 	float fZoneWeight;                  //!< ???
 	UNUSED(std::string thumbnail);                 //!< The thumbnail of the world
 	bool PlayerLoseCoinsOnDeath;        //!< Whether or not the user loses coins on death
-	bool disableSaveLoc;                //!< Disables the saving location?
+	UNUSED(bool disableSaveLoc);                //!< Disables the saving location?
 	float teamRadius;                   //!< ???
 	UNUSED(std::string gate_version);              //!< The gate version
-	bool mountsAllowed;                 //!< Whether or not mounts are allowed
+	UNUSED(bool mountsAllowed);                 //!< Whether or not mounts are allowed
 };
 
 class CDZoneTableTable : public CDTable<CDZoneTableTable> {

dGame/Character.cpp

@@ -314,7 +314,7 @@ void Character::SaveXMLToDatabase() {
 
 		auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 		// lzid garbage, binary concat of zoneID, zoneInstance and zoneClone
-		if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+		if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0) {
 			uint64_t lzidConcat = zoneInfo.GetCloneID();
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetInstanceID());
 			lzidConcat = (lzidConcat << 16) | uint16_t(zoneInfo.GetMapID());

dGame/Player.cpp

@@ -228,9 +228,9 @@ Player* Player::GetPlayer(const std::string& name) {
 
 	for (auto* character : characters) {
 		if (!character->IsPlayer()) continue;
-		
-		if (GeneralUtils::CaseInsensitiveStringCompare(name, character->GetCharacter()->GetName())) {
-			return dynamic_cast<Player*>(character);
+
+		if (character->GetCharacter()->GetName() == name) {
+			return static_cast<Player*>(character);
 		}
 	}
 

dGame/UserManager.cpp

@@ -125,7 +125,7 @@ User* UserManager::GetUser(const SystemAddress& sysAddr) {
 User* UserManager::GetUser(const std::string& username) {
 	for (auto p : m_Users) {
 		if (p.second) {
-			if (GeneralUtils::CaseInsensitiveStringCompare(p.second->GetUsername(), username)) return p.second;
+			if (p.second->GetUsername() == username) return p.second;
 		}
 	}
 

dGame/dBehaviors/BasicAttackBehavior.cpp

@@ -3,8 +3,6 @@
 #include "Game.h"
 #include "Logger.h"
 #include "EntityManager.h"
-#include "dZoneManager.h"
-#include "WorldConfig.h"
 #include "DestroyableComponent.h"
 #include "BehaviorContext.h"
 #include "eBasicAttackSuccessTypes.h"
@@ -15,15 +13,8 @@ void BasicAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bi
 
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
 		if (destroyableComponent != nullptr) {
-			PlayFx(u"onhit", entity->GetObjectID()); //This damage animation doesn't seem to play consistently
+			PlayFx(u"onhit", entity->GetObjectID());
 			destroyableComponent->Damage(this->m_MaxDamage, context->originator, context->skillID);
-
-			//Handle player damage cooldown
-			if (entity->IsPlayer() && !this->m_DontApplyImmune) {
-				const float immunityTime = Game::zoneManager->GetWorldConfig()->globalImmunityTime;
-				destroyableComponent->SetDamageCooldownTimer(immunityTime);
-				LOG_DEBUG("Target targetEntity %llu took damage, setting damage cooldown timer to %f s", branch.target, immunityTime);
-			}
 		}
 
 		this->m_OnSuccess->Handle(context, bitStream, branch);
@@ -81,7 +72,6 @@ void BasicAttackBehavior::DoHandleBehavior(BehaviorContext* context, RakNet::Bit
 	}
 
 	if (isImmune) {
-		LOG_DEBUG("Target targetEntity %llu is immune!", branch.target);
 		this->m_OnFailImmune->Handle(context, bitStream, branch);
 		return;
 	}
@@ -188,15 +178,11 @@ void BasicAttackBehavior::DoBehaviorCalculation(BehaviorContext* context, RakNet
 		return;
 	}
 
-	const float immunityTime = Game::zoneManager->GetWorldConfig()->globalImmunityTime;
-	LOG_DEBUG("Damage cooldown timer currently %f s", destroyableComponent->GetDamageCooldownTimer());
-
-	const bool isImmune = (destroyableComponent->IsImmune()) || (destroyableComponent->IsCooldownImmune());
+	const bool isImmune = destroyableComponent->IsImmune();
 
 	bitStream->Write(isImmune);
 
 	if (isImmune) {
-		LOG_DEBUG("Target targetEntity %llu is immune!", branch.target);
 		this->m_OnFailImmune->Calculate(context, bitStream, branch);
 		return;
 	}
@@ -217,12 +203,6 @@ void BasicAttackBehavior::DoBehaviorCalculation(BehaviorContext* context, RakNet
 
 	bitStream->Write(isSuccess);
 
-	//Handle player damage cooldown
-	if (isSuccess && targetEntity->IsPlayer() && !this->m_DontApplyImmune) {
-		destroyableComponent->SetDamageCooldownTimer(immunityTime);
-		LOG_DEBUG("Target targetEntity %llu took damage, setting damage cooldown timer to %f s", branch.target, immunityTime);
-	}
-
 	eBasicAttackSuccessTypes successState = eBasicAttackSuccessTypes::FAILIMMUNE;
 	if (isSuccess) {
 		if (healthDamageDealt >= 1) {
@@ -256,8 +236,6 @@ void BasicAttackBehavior::DoBehaviorCalculation(BehaviorContext* context, RakNet
 }
 
 void BasicAttackBehavior::Load() {
-	this->m_DontApplyImmune = GetBoolean("dont_apply_immune");
-
 	this->m_MinDamage = GetInt("min damage");
 	if (this->m_MinDamage == 0) this->m_MinDamage = 1;
 

dGame/dBehaviors/BasicAttackBehavior.h

@@ -10,14 +10,14 @@ public:
 	/**
 	 * @brief Reads a 16bit short from the bitStream and when the actual behavior handling finishes with all of its branches, the bitStream
 	 * is then offset to after the allocated bits for this stream.
-	 *
+	 * 
 	 */
 	void DoHandleBehavior(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch);
 
 	/**
 	 * @brief Handles a client initialized Basic Attack Behavior cast to be deserialized and verified on the server.
-	 *
-	 * @param context The Skill's Behavior context.  All behaviors in the same tree share the same context
+	 * 
+	 * @param context The Skill's Behavior context.  All behaviors in the same tree share the same context 
 	 * @param bitStream The bitStream to deserialize.  BitStreams will always check their bounds before reading in a behavior
 	 * and will fail gracefully if an overread is detected.
 	 * @param branch The context of this specific branch of the Skill Behavior.  Changes based on which branch you are going down.
@@ -27,13 +27,13 @@ public:
 	/**
 	 * @brief Writes a 16bit short to the bitStream and when the actual behavior calculation finishes with all of its branches, the number
 	 * of bits used is then written to where the 16bit short initially was.
-	 *
+	 * 
 	 */
 	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
 
 	/**
 	 * @brief Calculates a server initialized Basic Attack Behavior cast to be serialized to the client
-	 *
+	 * 
 	 * @param context The Skill's Behavior context.  All behaviors in the same tree share the same context
 	 * @param bitStream The bitStream to serialize to.
 	 * @param branch The context of this specific branch of the Skill Behavior.  Changes based on which branch you are going down.
@@ -44,12 +44,10 @@ public:
 	 * @brief Loads this Behaviors parameters from the database.  For this behavior specifically:
 	 * max and min damage will always be the same.  If min is less than max, they are both set to max.
 	 * If an action is not in the database, then no action is taken for that result.
-	 *
+	 * 
 	 */
 	void Load() override;
 private:
-	bool m_DontApplyImmune;
-
 	uint32_t m_MinDamage;
 
 	uint32_t m_MaxDamage;

dGame/dBehaviors/Behavior.cpp

@@ -64,7 +64,6 @@
 #include "FallSpeedBehavior.h"
 #include "ChangeIdleFlagsBehavior.h"
 #include "DarkInspirationBehavior.h"
-#include "ConsumeItemBehavior.h"
 
  //CDClient includes
 #include "CDBehaviorParameterTable.h"
@@ -201,9 +200,7 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 	case BehaviorTemplates::BEHAVIOR_SKILL_EVENT:
 		behavior = new SkillEventBehavior(behaviorId);
 		break;
-	case BehaviorTemplates::BEHAVIOR_CONSUME_ITEM:
-		behavior = new ConsumeItemBehavior(behaviorId);
-		break;
+	case BehaviorTemplates::BEHAVIOR_CONSUME_ITEM: break;
 	case BehaviorTemplates::BEHAVIOR_SKILL_CAST_FAILED:
 		behavior = new SkillCastFailedBehavior(behaviorId);
 		break;

dGame/dBehaviors/CMakeLists.txt

@@ -16,7 +16,6 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"ChangeOrientationBehavior.cpp"
 	"ChargeUpBehavior.cpp"
 	"ClearTargetBehavior.cpp"
-	"ConsumeItemBehavior.cpp"
 	"DamageAbsorptionBehavior.cpp"
 	"DamageReductionBehavior.cpp"
 	"DarkInspirationBehavior.cpp"

dGame/dBehaviors/ConsumeItemBehavior.cpp

@@ -1,31 +0,0 @@
-#include "ConsumeItemBehavior.h"
-#include "BehaviorContext.h"
-#include "BehaviorBranchContext.h"
-#include "InventoryComponent.h"
-
-void ConsumeItemBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	auto action_to_cast = m_ActionNotConsumed;
-	if (this->m_ConsumeLOT != -1) {
-		auto caster = Game::entityManager->GetEntity(context->caster);
-		if (!caster) return;
-
-		auto inventoryComponent = caster->GetComponent<InventoryComponent>();
-		if (!inventoryComponent) return;
-
-		if (inventoryComponent->RemoveItem(this->m_ConsumeLOT, this->m_NumToConsume, eInventoryType::INVALID, false, true)){
-			action_to_cast = m_ActionConsumed;
-		}
-	}
-	if(action_to_cast) action_to_cast->Handle(context, bitStream, branch);
-}
-
-void ConsumeItemBehavior::Sync(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
-	Handle(context, bitStream, branch);
-}
-
-void ConsumeItemBehavior::Load() {
-	this->m_ConsumeLOT = GetInt("consume_lot", -1);
-	this->m_NumToConsume = GetInt("num_to_consume", 1);
-	this->m_ActionNotConsumed = GetAction("action_not_consumed");
-	this->m_ActionConsumed = GetAction("action_consumed");
-}

dGame/dBehaviors/ConsumeItemBehavior.h

@@ -1,17 +0,0 @@
-#pragma once
-#include "Behavior.h"
-
-class ConsumeItemBehavior final : public Behavior
-{
-public:
-	explicit ConsumeItemBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
-	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Sync(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
-	void Load() override;
-
-private:
-	LOT m_ConsumeLOT;
-	uint32_t m_NumToConsume;
-	Behavior* m_ActionNotConsumed;
-	Behavior* m_ActionConsumed;
-};

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -68,10 +68,7 @@ ControllablePhysicsComponent::~ControllablePhysicsComponent() {
 }
 
 void ControllablePhysicsComponent::Update(float deltaTime) {
-	if (m_Static || m_Velocity == NiPoint3::ZERO) return;
-	m_Position += m_Velocity * deltaTime;
-	m_DirtyPosition = true;
-	Game::entityManager->SerializeEntity(m_Parent);
+
 }
 
 void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) {
@@ -104,14 +101,14 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bo
 		outBitStream->Write(m_GravityScale);
 		outBitStream->Write(m_SpeedMultiplier);
 
-		if (!bIsInitialUpdate) m_DirtyCheats = false;
+		m_DirtyCheats = false;
 	}
 
 	outBitStream->Write(m_DirtyEquippedItemInfo);
 	if (m_DirtyEquippedItemInfo) {
 		outBitStream->Write(m_PickupRadius);
 		outBitStream->Write(m_InJetpackMode);
-		if (!bIsInitialUpdate) m_DirtyEquippedItemInfo = false;
+		m_DirtyEquippedItemInfo = false;
 	}
 
 	outBitStream->Write(m_DirtyBubble);
@@ -121,7 +118,7 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bo
 			outBitStream->Write(m_BubbleType);
 			outBitStream->Write(m_SpecialAnims);
 		}
-		if (!bIsInitialUpdate) m_DirtyBubble = false;
+		m_DirtyBubble = false;
 	}
 
 	outBitStream->Write(m_DirtyPosition || bIsInitialUpdate);
@@ -153,12 +150,11 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bo
 		}
 
 		outBitStream->Write0();
+	}
 
-		if (!bIsInitialUpdate) {
-			m_DirtyPosition = false;
-			outBitStream->Write(m_IsTeleporting);
-			m_IsTeleporting = false;
-		}
+	if (!bIsInitialUpdate) {
+		outBitStream->Write(m_IsTeleporting);
+		m_IsTeleporting = false;
 	}
 }
 
@@ -191,7 +187,7 @@ void ControllablePhysicsComponent::UpdateXml(tinyxml2::XMLDocument* doc) {
 
 	auto zoneInfo = Game::zoneManager->GetZone()->GetZoneID();
 
-	if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0 && !Game::zoneManager->GetDisableSaveLocation()) {
+	if (zoneInfo.GetMapID() != 0 && zoneInfo.GetCloneID() == 0) {
 		character->SetAttribute("lzx", m_Position.x);
 		character->SetAttribute("lzy", m_Position.y);
 		character->SetAttribute("lzz", m_Position.z);
@@ -313,7 +309,7 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
 	Game::entityManager->SerializeEntity(m_Parent);
 }
 
-void ControllablePhysicsComponent::ActivateBubbleBuff(eBubbleType bubbleType, bool specialAnims) {
+void ControllablePhysicsComponent::ActivateBubbleBuff(eBubbleType bubbleType, bool specialAnims){
 	if (m_IsInBubble) {
 		LOG("Already in bubble");
 		return;
@@ -325,7 +321,7 @@ void ControllablePhysicsComponent::ActivateBubbleBuff(eBubbleType bubbleType, bo
 	Game::entityManager->SerializeEntity(m_Parent);
 }
 
-void ControllablePhysicsComponent::DeactivateBubbleBuff() {
+void ControllablePhysicsComponent::DeactivateBubbleBuff(){
 	m_DirtyBubble = true;
 	m_IsInBubble = false;
 	Game::entityManager->SerializeEntity(m_Parent);
@@ -340,9 +336,9 @@ void ControllablePhysicsComponent::SetStunImmunity(
 	const bool bImmuneToStunJump,
 	const bool bImmuneToStunMove,
 	const bool bImmuneToStunTurn,
-	const bool bImmuneToStunUseItem) {
+	const bool bImmuneToStunUseItem){
 
-	if (state == eStateChangeType::POP) {
+	if (state == eStateChangeType::POP){
 		if (bImmuneToStunAttack && m_ImmuneToStunAttackCount > 0) 		m_ImmuneToStunAttackCount -= 1;
 		if (bImmuneToStunEquip && m_ImmuneToStunEquipCount > 0) 		m_ImmuneToStunEquipCount -= 1;
 		if (bImmuneToStunInteract && m_ImmuneToStunInteractCount > 0) 	m_ImmuneToStunInteractCount -= 1;

dGame/dComponents/DestroyableComponent.cpp

@@ -73,8 +73,6 @@ DestroyableComponent::DestroyableComponent(Entity* parent) : Component(parent) {
 	m_ImmuneToQuickbuildInterruptCount = 0;
 	m_ImmuneToPullToPointCount = 0;
 	m_DeathBehavior = -1;
-
-	m_DamageCooldownTimer = 0.0f;
 }
 
 DestroyableComponent::~DestroyableComponent() {
@@ -181,10 +179,6 @@ void DestroyableComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsIn
 	}
 }
 
-void DestroyableComponent::Update(float deltaTime) {
-	m_DamageCooldownTimer -= deltaTime;
-}
-
 void DestroyableComponent::LoadFromXml(tinyxml2::XMLDocument* doc) {
 	tinyxml2::XMLElement* dest = doc->FirstChildElement("obj")->FirstChildElement("dest");
 	if (!dest) {
@@ -415,7 +409,7 @@ void DestroyableComponent::AddFaction(const int32_t factionID, const bool ignore
 }
 
 bool DestroyableComponent::IsEnemy(const Entity* other) const {
-	if (m_Parent->IsPlayer() && other->IsPlayer()) {
+	if (m_Parent->IsPlayer() && other->IsPlayer()){
 		auto* thisCharacterComponent = m_Parent->GetComponent<CharacterComponent>();
 		if (!thisCharacterComponent) return false;
 		auto* otherCharacterComponent = other->GetComponent<CharacterComponent>();
@@ -470,10 +464,6 @@ bool DestroyableComponent::IsImmune() const {
 	return m_IsGMImmune || m_ImmuneToBasicAttackCount > 0;
 }
 
-bool DestroyableComponent::IsCooldownImmune() const {
-	return m_DamageCooldownTimer > 0.0f;
-}
-
 bool DestroyableComponent::IsKnockbackImmune() const {
 	auto* characterComponent = m_Parent->GetComponent<CharacterComponent>();
 	auto* inventoryComponent = m_Parent->GetComponent<InventoryComponent>();
@@ -556,8 +546,7 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
 		return;
 	}
 
-	if (IsImmune() || IsCooldownImmune()) {
-		LOG_DEBUG("Target targetEntity %llu is immune!", m_Parent->GetObjectID()); //Immune is succesfully proc'd
+	if (IsImmune()) {
 		return;
 	}
 
@@ -645,9 +634,9 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
 	}
 
 	//check if hardcore mode is enabled
-	if (Game::entityManager->GetHardcoreMode()) {
+    if (Game::entityManager->GetHardcoreMode()) {
 		DoHardcoreModeDrops(source);
-	}
+    }
 
 	Smash(source, eKillType::VIOLENT, u"", skillID);
 }
@@ -807,16 +796,16 @@ void DestroyableComponent::SetFaction(int32_t factionID, bool ignoreChecks) {
 }
 
 void DestroyableComponent::SetStatusImmunity(
-	const eStateChangeType state,
-	const bool bImmuneToBasicAttack,
-	const bool bImmuneToDamageOverTime,
-	const bool bImmuneToKnockback,
-	const bool bImmuneToInterrupt,
-	const bool bImmuneToSpeed,
-	const bool bImmuneToImaginationGain,
-	const bool bImmuneToImaginationLoss,
-	const bool bImmuneToQuickbuildInterrupt,
-	const bool bImmuneToPullToPoint) {
+		const eStateChangeType state,
+		const bool bImmuneToBasicAttack,
+		const bool bImmuneToDamageOverTime,
+		const bool bImmuneToKnockback,
+		const bool bImmuneToInterrupt,
+		const bool bImmuneToSpeed,
+		const bool bImmuneToImaginationGain,
+		const bool bImmuneToImaginationLoss,
+		const bool bImmuneToQuickbuildInterrupt,
+		const bool bImmuneToPullToPoint) {
 
 	if (state == eStateChangeType::POP) {
 		if (bImmuneToBasicAttack && m_ImmuneToBasicAttackCount > 0) 				m_ImmuneToBasicAttackCount -= 1;
@@ -829,7 +818,7 @@ void DestroyableComponent::SetStatusImmunity(
 		if (bImmuneToQuickbuildInterrupt && m_ImmuneToQuickbuildInterruptCount > 0) m_ImmuneToQuickbuildInterruptCount -= 1;
 		if (bImmuneToPullToPoint && m_ImmuneToPullToPointCount > 0) 				m_ImmuneToPullToPointCount -= 1;
 
-	} else if (state == eStateChangeType::PUSH) {
+	} else if (state == eStateChangeType::PUSH){
 		if (bImmuneToBasicAttack) 			m_ImmuneToBasicAttackCount += 1;
 		if (bImmuneToDamageOverTime) 		m_ImmuneToDamageOverTimeCount += 1;
 		if (bImmuneToKnockback) 			m_ImmuneToKnockbackCount += 1;
@@ -956,7 +945,7 @@ void DestroyableComponent::AddOnHitCallback(const std::function<void(Entity*)>&
 	m_OnHitCallbacks.push_back(callback);
 }
 
-void DestroyableComponent::DoHardcoreModeDrops(const LWOOBJID source) {
+void DestroyableComponent::DoHardcoreModeDrops(const LWOOBJID source){
 	//check if this is a player:
 	if (m_Parent->IsPlayer()) {
 		//remove hardcore_lose_uscore_on_death_percent from the player's uscore:
@@ -974,9 +963,9 @@ void DestroyableComponent::DoHardcoreModeDrops(const LWOOBJID source) {
 			if (inventory) {
 				//get the items inventory:
 				auto items = inventory->GetInventory(eInventoryType::ITEMS);
-				if (items) {
+				if (items){
 					auto itemMap = items->GetItems();
-					if (!itemMap.empty()) {
+					if (!itemMap.empty()){
 						for (const auto& item : itemMap) {
 							//drop the item:
 							if (!item.second) continue;

dGame/dComponents/DestroyableComponent.h

@@ -24,7 +24,6 @@ public:
 	DestroyableComponent(Entity* parentEntity);
 	~DestroyableComponent() override;
 
-	void Update(float deltaTime) override;
 	void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate) override;
 	void LoadFromXml(tinyxml2::XMLDocument* doc) override;
 	void UpdateXml(tinyxml2::XMLDocument* doc) override;
@@ -167,11 +166,6 @@ public:
 	 */
 	bool IsImmune() const;
 
-	/**
-	 * @return whether this entity is currently immune to attacks due to a damage cooldown period
-	*/
-	bool IsCooldownImmune() const;
-
 	/**
 	 * Sets if this entity has GM immunity, making it not killable
 	 * @param value the GM immunity of this entity
@@ -412,23 +406,18 @@ public:
 	);
 
 	// Getters for status immunities
-	const bool GetImmuneToBasicAttack() { return m_ImmuneToBasicAttackCount > 0; };
-	const bool GetImmuneToDamageOverTime() { return m_ImmuneToDamageOverTimeCount > 0; };
-	const bool GetImmuneToKnockback() { return m_ImmuneToKnockbackCount > 0; };
-	const bool GetImmuneToInterrupt() { return m_ImmuneToInterruptCount > 0; };
-	const bool GetImmuneToSpeed() { return m_ImmuneToSpeedCount > 0; };
-	const bool GetImmuneToImaginationGain() { return m_ImmuneToImaginationGainCount > 0; };
-	const bool GetImmuneToImaginationLoss() { return m_ImmuneToImaginationLossCount > 0; };
-	const bool GetImmuneToQuickbuildInterrupt() { return m_ImmuneToQuickbuildInterruptCount > 0; };
-	const bool GetImmuneToPullToPoint() { return m_ImmuneToPullToPointCount > 0; };
+	const bool GetImmuneToBasicAttack() {return m_ImmuneToBasicAttackCount > 0;};
+	const bool GetImmuneToDamageOverTime() {return m_ImmuneToDamageOverTimeCount > 0;};
+	const bool GetImmuneToKnockback() {return m_ImmuneToKnockbackCount > 0;};
+	const bool GetImmuneToInterrupt() {return m_ImmuneToInterruptCount > 0;};
+	const bool GetImmuneToSpeed() {return m_ImmuneToSpeedCount > 0;};
+	const bool GetImmuneToImaginationGain() {return m_ImmuneToImaginationGainCount > 0;};
+	const bool GetImmuneToImaginationLoss() {return m_ImmuneToImaginationLossCount > 0;};
+	const bool GetImmuneToQuickbuildInterrupt() {return m_ImmuneToQuickbuildInterruptCount > 0;};
+	const bool GetImmuneToPullToPoint() {return m_ImmuneToPullToPointCount > 0;};
 
-	// Damage cooldown setters/getters
-	void SetDamageCooldownTimer(float value) { m_DamageCooldownTimer = value; }
-	float GetDamageCooldownTimer() { return m_DamageCooldownTimer; }
-
-	// Death behavior setters/getters
-	void SetDeathBehavior(int32_t value) { m_DeathBehavior = value; }
 	int32_t GetDeathBehavior() const { return m_DeathBehavior; }
+	void SetDeathBehavior(int32_t value) { m_DeathBehavior = value; }
 
 	/**
 	 * Utility to reset all stats to the default stats based on items and completed missions
@@ -616,11 +605,6 @@ private:
 	 * Death behavior type.  If 0, the client plays a death animation as opposed to a smash animation.
 	 */
 	int32_t m_DeathBehavior;
-
-	/**
-	 * Damage immunity cooldown timer. Set to a value that then counts down to create a damage cooldown for players
-	 */
-	float 	m_DamageCooldownTimer;
 };
 
 #endif // DESTROYABLECOMPONENT_H

dGame/dComponents/InventoryComponent.cpp

@@ -300,26 +300,38 @@ void InventoryComponent::AddItem(
 	}
 }
 
-bool InventoryComponent::RemoveItem(const LOT lot, const uint32_t count, eInventoryType inventoryType, const bool ignoreBound, const bool silent) {
+void InventoryComponent::RemoveItem(const LOT lot, const uint32_t count, eInventoryType inventoryType, const bool ignoreBound) {
 	if (count == 0) {
 		LOG("Attempted to remove 0 of item (%i) from the inventory!", lot);
-		return false;
+
+		return;
 	}
-	if (inventoryType == INVALID) inventoryType = Inventory::FindInventoryTypeForLot(lot);
+
+	if (inventoryType == INVALID) {
+		inventoryType = Inventory::FindInventoryTypeForLot(lot);
+	}
+
 	auto* inventory = GetInventory(inventoryType);
-	if (!inventory) return false;
+
+	if (inventory == nullptr) {
+		return;
+	}
 
 	auto left = std::min<uint32_t>(count, inventory->GetLotCount(lot));
-	if (left != count) return false;
 
 	while (left > 0) {
 		auto* item = FindItemByLot(lot, inventoryType, false, ignoreBound);
-		if (!item) break;
+
+		if (item == nullptr) {
+			break;
+		}
+
 		const auto delta = std::min<uint32_t>(left, item->GetCount());
-		item->SetCount(item->GetCount() - delta, silent);
+
+		item->SetCount(item->GetCount() - delta);
+
 		left -= delta;
 	}
-	return true;
 }
 
 void InventoryComponent::MoveItemToInventory(Item* item, const eInventoryType inventory, const uint32_t count, const bool showFlyingLot, bool isModMoveAndEquip, const bool ignoreEquipped, const int32_t preferredSlot) {

dGame/dComponents/InventoryComponent.h

@@ -118,9 +118,8 @@ public:
 	 * @param count the number of items to remove
 	 * @param inventoryType optional inventory type to remove the item from
 	 * @param ignoreBound ignores bound items
-	 * @param silent silently remove the item
 	 */
-	bool RemoveItem(LOT lot, uint32_t count, eInventoryType inventoryType = INVALID, bool ignoreBound = false, bool silent = false);
+	void RemoveItem(LOT lot, uint32_t count, eInventoryType inventoryType = INVALID, bool ignoreBound = false);
 
 	/**
 	 * Moves an existing item to an inventory of the entity

dGame/dComponents/PetComponent.cpp

@@ -29,7 +29,6 @@
 #include "RenderComponent.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
-#include "eMissionState.h"
 
 std::unordered_map<LOT, PetComponent::PetPuzzleData> PetComponent::buildCache{};
 std::unordered_map<LWOOBJID, LWOOBJID> PetComponent::currentActivities{};
@@ -440,15 +439,9 @@ void PetComponent::Update(float deltaTime) {
 		}
 	}
 
-	auto* missionComponent = owner->GetComponent<MissionComponent>();
-	if (!missionComponent) return;
-
-	// Determine if the "Lost Tags" mission has been completed and digging has been unlocked
-	const bool digUnlocked = missionComponent->GetMissionState(842) == eMissionState::COMPLETE;
-
 	Entity* closestTresure = PetDigServer::GetClosestTresure(position);
 
-	if (closestTresure != nullptr && digUnlocked) {
+	if (closestTresure != nullptr) {
 		// Skeleton Dragon Pat special case for bone digging
 		if (closestTresure->GetLOT() == 12192 && m_Parent->GetLOT() != 13067) {
 			goto skipTresure;

dGame/dComponents/PropertyManagementComponent.cpp

@@ -423,25 +423,6 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
 		return;
 	}
 
-	auto* model = Game::entityManager->GetEntity(id);
-
-	if (model == nullptr) {
-		LOG("Failed to find model entity");
-
-		return;
-	}
-
-	if (model->GetLOT() == 14 && deleteReason == 0) {
-		LOG("User is trying to pick up a BBB model, but this is not implemented, so we return to prevent the user from losing the model");
-
-		GameMessages::SendUGCEquipPostDeleteBasedOnEditMode(entity->GetObjectID(), entity->GetSystemAddress(), LWOOBJID_EMPTY, 0);
-
-		// Need this to pop the user out of their current state
-		GameMessages::SendPlaceModelResponse(entity->GetObjectID(), entity->GetSystemAddress(), entity->GetPosition(), m_Parent->GetObjectID(), 14, entity->GetRotation());
-
-		return;
-	}
-
 	const auto index = models.find(id);
 
 	if (index == models.end()) {
@@ -460,6 +441,14 @@ void PropertyManagementComponent::DeleteModel(const LWOOBJID id, const int delet
 		LOG("Failed to find spawner");
 	}
 
+	auto* model = Game::entityManager->GetEntity(id);
+
+	if (model == nullptr) {
+		LOG("Failed to find model entity");
+
+		return;
+	}
+
 	Game::entityManager->DestructEntity(model);
 
 	LOG("Deleting model LOT %i", model->GetLOT());

dGame/dGameMessages/GameMessages.cpp

@@ -2523,9 +2523,15 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
 	inStream->Read(sd0Size);
 	std::shared_ptr<char[]> sd0Data(new char[sd0Size]);
 
-	if (sd0Data == nullptr) return;
+	if (sd0Data == nullptr) {
+		return;
+	}
 
-	inStream->ReadAlignedBytes(reinterpret_cast<unsigned char*>(sd0Data.get()), sd0Size);
+	for (uint32_t i = 0; i < sd0Size; ++i) {
+		uint8_t c;
+		inStream->Read(c);
+		sd0Data[i] = c;
+	}
 
 	uint32_t timeTaken;
 	inStream->Read(timeTaken);
@@ -2559,155 +2565,164 @@ void GameMessages::HandleBBBSaveRequest(RakNet::BitStream* inStream, Entity* ent
 
 	//We runs this in async because the http library here is blocking, meaning it'll halt the thread.
 	//But we don't want the server to go unresponsive, because then the client would disconnect.
+	auto returnVal = std::async(std::launch::async, [&]() {
 
-	//We need to get a new ID for our model first:
-	ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newID) {
-		LWOOBJID newIDL = newID;
-		GeneralUtils::SetBit(newIDL, eObjectBits::CHARACTER);
-		GeneralUtils::SetBit(newIDL, eObjectBits::PERSISTENT);
+		//We need to get a new ID for our model first:
+		ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newID) {
+			LWOOBJID newIDL = newID;
+			GeneralUtils::SetBit(newIDL, eObjectBits::CHARACTER);
+			GeneralUtils::SetBit(newIDL, eObjectBits::PERSISTENT);
 
-		uint32_t blueprintIDSmall = ObjectIDManager::Instance()->GenerateRandomObjectID();
-		LWOOBJID blueprintID = blueprintIDSmall;
-		GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER);
-		GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
+			ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t blueprintIDSmall) {
+				blueprintIDSmall = ObjectIDManager::Instance()->GenerateRandomObjectID();
+				LWOOBJID blueprintID = blueprintIDSmall;
+				GeneralUtils::SetBit(blueprintID, eObjectBits::CHARACTER);
+				GeneralUtils::SetBit(blueprintID, eObjectBits::PERSISTENT);
 
-		//We need to get the propertyID: (stolen from Wincent's propertyManagementComp)
-		const auto& worldId = Game::zoneManager->GetZone()->GetZoneID();
+				//We need to get the propertyID: (stolen from Wincent's propertyManagementComp)
+				const auto& worldId = Game::zoneManager->GetZone()->GetZoneID();
 
-		const auto zoneId = worldId.GetMapID();
-		const auto cloneId = worldId.GetCloneID();
+				const auto zoneId = worldId.GetMapID();
+				const auto cloneId = worldId.GetCloneID();
 
-		auto query = CDClientDatabase::CreatePreppedStmt(
-			"SELECT id FROM PropertyTemplate WHERE mapID = ?;");
-		query.bind(1, (int)zoneId);
+				auto query = CDClientDatabase::CreatePreppedStmt(
+					"SELECT id FROM PropertyTemplate WHERE mapID = ?;");
+				query.bind(1, (int)zoneId);
 
-		auto result = query.execQuery();
+				auto result = query.execQuery();
 
-		if (result.eof() || result.fieldIsNull(0)) return;
+				if (result.eof() || result.fieldIsNull(0)) return;
 
-		int templateId = result.getIntField(0);
+				int templateId = result.getIntField(0);
 
-		auto* propertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE template_id = ? AND clone_id = ?;");
+				result.finalize();
 
-		propertyLookup->setInt(1, templateId);
-		propertyLookup->setInt64(2, cloneId);
+				auto* propertyLookup = Database::CreatePreppedStmt("SELECT * FROM properties WHERE template_id = ? AND clone_id = ?;");
 
-		auto* propertyEntry = propertyLookup->executeQuery();
-		uint64_t propertyId = 0;
+				propertyLookup->setInt(1, templateId);
+				propertyLookup->setInt64(2, cloneId);
 
-		if (propertyEntry->next()) {
-			propertyId = propertyEntry->getUInt64(1);
-		}
+				auto* propertyEntry = propertyLookup->executeQuery();
+				uint64_t propertyId = 0;
 
-		delete propertyEntry;
-		delete propertyLookup;
+				if (propertyEntry->next()) {
+					propertyId = propertyEntry->getUInt64(1);
+				}
 
-		//Insert into ugc:
-		auto ugcs = Database::CreatePreppedStmt("INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)");
-		ugcs->setUInt(1, blueprintIDSmall);
-		ugcs->setInt(2, entity->GetParentUser()->GetAccountID());
-		ugcs->setInt(3, entity->GetCharacter()->GetID());
-		ugcs->setInt(4, 0);
+				delete propertyEntry;
+				delete propertyLookup;
 
-		//whacky stream biz
-		std::string s(sd0Data.get(), sd0Size);
-		std::istringstream iss(s);
+				//Insert into ugc:
+				auto ugcs = Database::CreatePreppedStmt("INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)");
+				ugcs->setUInt(1, blueprintIDSmall);
+				ugcs->setInt(2, entity->GetParentUser()->GetAccountID());
+				ugcs->setInt(3, entity->GetCharacter()->GetID());
+				ugcs->setInt(4, 0);
 
-		ugcs->setBlob(5, &iss);
-		ugcs->setBoolean(6, false);
-		ugcs->setString(7, "weedeater.lxfml");
-		ugcs->execute();
-		delete ugcs;
+				//whacky stream biz
+				std::string s(sd0Data.get(), sd0Size);
+				std::istringstream iss(s);
+				std::istream& stream = iss;
 
-		//Insert into the db as a BBB model:
-		auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents` VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-		stmt->setUInt64(1, newIDL);
-		stmt->setUInt64(2, propertyId);
-		stmt->setUInt(3, blueprintIDSmall);
-		stmt->setUInt(4, 14); // 14 is the lot the BBB models use
-		stmt->setDouble(5, 0.0f); // x
-		stmt->setDouble(6, 0.0f); // y
-		stmt->setDouble(7, 0.0f); // z
-		stmt->setDouble(8, 0.0f); // rx
-		stmt->setDouble(9, 0.0f); // ry
-		stmt->setDouble(10, 0.0f); // rz
-		stmt->setDouble(11, 0.0f); // rw
-		stmt->setString(12, "Objects_14_name"); // Model name.  TODO make this customizable
-		stmt->setString(13, ""); // Model description.  TODO implement this.
-		stmt->setDouble(14, 0); // behavior 1.  TODO implement this.
-		stmt->setDouble(15, 0); // behavior 2.  TODO implement this.
-		stmt->setDouble(16, 0); // behavior 3.  TODO implement this.
-		stmt->setDouble(17, 0); // behavior 4.  TODO implement this.
-		stmt->setDouble(18, 0); // behavior 5.  TODO implement this.
-		stmt->execute();
-		delete stmt;
+				ugcs->setBlob(5, &iss);
+				ugcs->setBoolean(6, false);
+				ugcs->setString(7, "weedeater.lxfml");
+				ugcs->execute();
+				delete ugcs;
 
-		/*
-			Commented out until UGC server would be updated to use a sd0 file instead of lxfml stream.
-			(or you uncomment the lxfml decomp stuff above)
-		*/
+				//Insert into the db as a BBB model:
+				auto* stmt = Database::CreatePreppedStmt("INSERT INTO `properties_contents` VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+				stmt->setUInt64(1, newIDL);
+				stmt->setUInt64(2, propertyId);
+				stmt->setUInt(3, blueprintIDSmall);
+				stmt->setUInt(4, 14); // 14 is the lot the BBB models use
+				stmt->setDouble(5, 0.0f); // x
+				stmt->setDouble(6, 0.0f); // y
+				stmt->setDouble(7, 0.0f); // z
+				stmt->setDouble(8, 0.0f); // rx
+				stmt->setDouble(9, 0.0f); // ry
+				stmt->setDouble(10, 0.0f); // rz
+				stmt->setDouble(11, 0.0f); // rw
+				stmt->setString(12, "Objects_14_name"); // Model name.  TODO make this customizable
+				stmt->setString(13, ""); // Model description.  TODO implement this.
+				stmt->setDouble(14, 0); // behavior 1.  TODO implement this.
+				stmt->setDouble(15, 0); // behavior 2.  TODO implement this.
+				stmt->setDouble(16, 0); // behavior 3.  TODO implement this.
+				stmt->setDouble(17, 0); // behavior 4.  TODO implement this.
+				stmt->setDouble(18, 0); // behavior 5.  TODO implement this.
+				stmt->execute();
+				delete stmt;
 
-		////Send off to UGC for processing, if enabled:
-		//if (Game::config->GetValue("ugc_remote") == "1") {
-		//	std::string ugcIP = Game::config->GetValue("ugc_ip");
-		//	int ugcPort = std::stoi(Game::config->GetValue("ugc_port"));
+				/*
+					Commented out until UGC server would be updated to use a sd0 file instead of lxfml stream.
+					(or you uncomment the lxfml decomp stuff above)
+				*/
 
-		//	httplib::Client cli(ugcIP, ugcPort); //connect to UGC HTTP server using our config above ^
+				////Send off to UGC for processing, if enabled:
+				//if (Game::config->GetValue("ugc_remote") == "1") {
+				//	std::string ugcIP = Game::config->GetValue("ugc_ip");
+				//	int ugcPort = std::stoi(Game::config->GetValue("ugc_port"));
 
-		//	//Send out a request:
-		//	std::string request = "/3dservices/UGCC150/150" + std::to_string(blueprintID) + ".lxfml";
-		//	cli.Put(request.c_str(), lxfml.c_str(), "text/lxfml");
+				//	httplib::Client cli(ugcIP, ugcPort); //connect to UGC HTTP server using our config above ^
 
-		//	//When the "put" above returns, it means that the UGC HTTP server is done processing our model &
-		//	//the nif, hkx and checksum files are ready to be downloaded from cache.
-		//}
+				//	//Send out a request:
+				//	std::string request = "/3dservices/UGCC150/150" + std::to_string(blueprintID) + ".lxfml";
+				//	cli.Put(request.c_str(), lxfml.c_str(), "text/lxfml");
 
-		//Tell the client their model is saved: (this causes us to actually pop out of our current state):
-		CBITSTREAM;
-		BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::BLUEPRINT_SAVE_RESPONSE);
-		bitStream.Write(localId);
-		bitStream.Write(eBlueprintSaveResponseType::EverythingWorked);
-		bitStream.Write<uint32_t>(1);
-		bitStream.Write(blueprintID);
+				//	//When the "put" above returns, it means that the UGC HTTP server is done processing our model &
+				//	//the nif, hkx and checksum files are ready to be downloaded from cache.
+				//}
 
-		bitStream.Write<uint32_t>(sd0Size);
+				//Tell the client their model is saved: (this causes us to actually pop out of our current state):
+				CBITSTREAM;
+				BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::BLUEPRINT_SAVE_RESPONSE);
+				bitStream.Write(localId);
+				bitStream.Write(eBlueprintSaveResponseType::EverythingWorked);
+				bitStream.Write<uint32_t>(1);
+				bitStream.Write(blueprintID);
 
-		bitStream.WriteAlignedBytes(reinterpret_cast<unsigned char*>(sd0Data.get()), sd0Size);
+				bitStream.Write<uint32_t>(sd0Size);
 
-		SEND_PACKET;
+				for (size_t i = 0; i < sd0Size; ++i) {
+					bitStream.Write(sd0Data[i]);
+				}
 
-		//Now we have to construct this object:
+				SEND_PACKET;
 
-		EntityInfo info;
-		info.lot = 14;
-		info.pos = {};
-		info.rot = {};
-		info.spawner = nullptr;
-		info.spawnerID = entity->GetObjectID();
-		info.spawnerNodeID = 0;
+				//Now we have to construct this object:
 
-		LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", blueprintID);
-		LDFBaseData* componentWhitelist = new LDFData<int>(u"componentWhitelist", 1);
-		LDFBaseData* modelType = new LDFData<int>(u"modelType", 2);
-		LDFBaseData* propertyObjectID = new LDFData<bool>(u"propertyObjectID", true);
-		LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", newIDL);
+				EntityInfo info;
+				info.lot = 14;
+				info.pos = {};
+				info.rot = {};
+				info.spawner = nullptr;
+				info.spawnerID = entity->GetObjectID();
+				info.spawnerNodeID = 0;
 
-		info.settings.push_back(ldfBlueprintID);
-		info.settings.push_back(componentWhitelist);
-		info.settings.push_back(modelType);
-		info.settings.push_back(propertyObjectID);
-		info.settings.push_back(userModelID);
+				LDFBaseData* ldfBlueprintID = new LDFData<LWOOBJID>(u"blueprintid", blueprintID);
+				LDFBaseData* componentWhitelist = new LDFData<int>(u"componentWhitelist", 1);
+				LDFBaseData* modelType = new LDFData<int>(u"modelType", 2);
+				LDFBaseData* propertyObjectID = new LDFData<bool>(u"propertyObjectID", true);
+				LDFBaseData* userModelID = new LDFData<LWOOBJID>(u"userModelID", newIDL);
 
-		Entity* newEntity = Game::entityManager->CreateEntity(info, nullptr);
-		if (newEntity) {
-			Game::entityManager->ConstructEntity(newEntity);
+				info.settings.push_back(ldfBlueprintID);
+				info.settings.push_back(componentWhitelist);
+				info.settings.push_back(modelType);
+				info.settings.push_back(propertyObjectID);
+				info.settings.push_back(userModelID);
 
-			//Make sure the propMgmt doesn't delete our model after the server dies
-			//Trying to do this after the entity is constructed. Shouldn't really change anything but
-			//there was an issue with builds not appearing since it was placed above ConstructEntity.
-			PropertyManagementComponent::Instance()->AddModel(newEntity->GetObjectID(), newIDL);
-		}
+				Entity* newEntity = Game::entityManager->CreateEntity(info, nullptr);
+				if (newEntity) {
+					Game::entityManager->ConstructEntity(newEntity);
 
+					//Make sure the propMgmt doesn't delete our model after the server dies
+					//Trying to do this after the entity is constructed. Shouldn't really change anything but
+					//there was an issue with builds not appearing since it was placed above ConstructEntity.
+					PropertyManagementComponent::Instance()->AddModel(newEntity->GetObjectID(), newIDL);
+				}
+
+				});
+			});
 		});
 }
 
@@ -5119,10 +5134,6 @@ void GameMessages::HandleModularBuildConvertModel(RakNet::BitStream* inStream, E
 
 	item->Disassemble(TEMP_MODELS);
 
-	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt("DELETE FROM ugc_modular_build where ugc_id = ?"));
-	stmt->setUInt64(1, item->GetSubKey());
-	stmt->execute();
-
 	item->SetCount(item->GetCount() - 1, false, false, true, eLootSourceType::QUICKBUILD);
 }
 
@@ -5445,8 +5456,10 @@ void GameMessages::HandleRemoveItemFromInventory(RakNet::BitStream* inStream, En
 	iStackCount = std::min<uint32_t>(item->GetCount(), iStackCount);
 
 	if (bConfirmed) {
-		if (eInvType == eInventoryType::MODELS) {
-			item->DisassembleModel(iStackCount);
+		for (auto i = 0; i < iStackCount; ++i) {
+			if (eInvType == eInventoryType::MODELS) {
+				item->DisassembleModel();
+			}
 		}
 
 		item->SetCount(item->GetCount() - iStackCount, true);
@@ -5566,6 +5579,13 @@ void GameMessages::HandleModularBuildFinish(RakNet::BitStream* inStream, Entity*
 	InventoryComponent* inv = static_cast<InventoryComponent*>(character->GetComponent(eReplicaComponentType::INVENTORY));
 	if (!inv) return;
 
+	LOG("Build finished");
+
+	GameMessages::SendFinishArrangingWithItem(character, entity->GetObjectID()); // kick them from modular build
+	GameMessages::SendModularBuildEnd(character); // i dont know if this does anything but DLUv2 did it
+
+	//inv->UnequipItem(inv->GetItemStackByLOT(6086, eInventoryType::ITEMS)); // take off the thinking cap
+	//Game::entityManager->SerializeEntity(entity);
 
 	uint8_t count; // 3 for rockets, 7 for cars
 
@@ -5600,61 +5620,42 @@ void GameMessages::HandleModularBuildFinish(RakNet::BitStream* inStream, Entity*
 			}
 		}
 
-		ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t newId) {
-			LOG("Build finished");
-			GameMessages::SendFinishArrangingWithItem(character, entity->GetObjectID()); // kick them from modular build
-			GameMessages::SendModularBuildEnd(character); // i dont know if this does anything but DLUv2 did it
+		const auto moduleAssembly = new LDFData<std::u16string>(u"assemblyPartLOTs", modules);
 
-			//inv->UnequipItem(inv->GetItemStackByLOT(6086, eInventoryType::ITEMS)); // take off the thinking cap
-			//Game::entityManager->SerializeEntity(entity);
+		std::vector<LDFBaseData*> config;
+		config.push_back(moduleAssembly);
 
-			const auto moduleAssembly = new LDFData<std::u16string>(u"assemblyPartLOTs", modules);
+		if (count == 3) {
+			inv->AddItem(6416, 1, eLootSourceType::QUICKBUILD, eInventoryType::MODELS, config);
+		} else if (count == 7) {
+			inv->AddItem(8092, 1, eLootSourceType::QUICKBUILD, eInventoryType::MODELS, config);
+		}
 
-			std::vector<LDFBaseData*> config;
-			config.push_back(moduleAssembly);
+		auto* missionComponent = character->GetComponent<MissionComponent>();
 
-			LWOOBJID newIdBig = newId;
-			GeneralUtils::SetBit(newIdBig, eObjectBits::CHARACTER);
-
-			if (count == 3) {
-				inv->AddItem(6416, 1, eLootSourceType::QUICKBUILD, eInventoryType::MODELS, config, LWOOBJID_EMPTY, true, false, newIdBig);
-			} else if (count == 7) {
-				inv->AddItem(8092, 1, eLootSourceType::QUICKBUILD, eInventoryType::MODELS, config, LWOOBJID_EMPTY, true, false, newIdBig);
+		if (entity->GetLOT() != 9980 || Game::server->GetZoneID() != 1200) {
+			if (missionComponent != nullptr) {
+				missionComponent->Progress(eMissionTaskType::SCRIPT, entity->GetLOT(), entity->GetObjectID());
+				if (count >= 7 && everyPieceSwapped) missionComponent->Progress(eMissionTaskType::RACING, LWOOBJID_EMPTY, (LWOOBJID)eRacingTaskParam::MODULAR_BUILDING);
 			}
+		}
+	}
 
-			std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt("INSERT INTO ugc_modular_build (ugc_id, ldf_config, character_id) VALUES (?,?,?)"));
-			stmt->setUInt64(1, newIdBig);
-			stmt->setString(2, GeneralUtils::UTF16ToWTF8(modules));
-			auto* pCharacter = character->GetCharacter();
-			pCharacter ? stmt->setUInt(3, pCharacter->GetID()) : stmt->setNull(3, sql::DataType::BIGINT);
-			stmt->execute();
+	ScriptComponent* script = static_cast<ScriptComponent*>(entity->GetComponent(eReplicaComponentType::SCRIPT));
 
-			auto* missionComponent = character->GetComponent<MissionComponent>();
+	for (CppScripts::Script* script : CppScripts::GetEntityScripts(entity)) {
+		script->OnModularBuildExit(entity, character, count >= 3, modList);
+	}
 
-			if (entity->GetLOT() != 9980 || Game::server->GetZoneID() != 1200) {
-				if (missionComponent != nullptr) {
-					missionComponent->Progress(eMissionTaskType::SCRIPT, entity->GetLOT(), entity->GetObjectID());
-					if (count >= 7 && everyPieceSwapped) missionComponent->Progress(eMissionTaskType::RACING, LWOOBJID_EMPTY, (LWOOBJID)eRacingTaskParam::MODULAR_BUILDING);
-				}
-			}
+	// Move remaining temp models back to models
+	std::vector<Item*> items;
 
-			ScriptComponent* script = static_cast<ScriptComponent*>(entity->GetComponent(eReplicaComponentType::SCRIPT));
+	for (const auto& pair : temp->GetItems()) {
+		items.push_back(pair.second);
+	}
 
-			for (CppScripts::Script* script : CppScripts::GetEntityScripts(entity)) {
-				script->OnModularBuildExit(entity, character, count >= 3, modList);
-			}
-
-			// Move remaining temp models back to models
-			std::vector<Item*> items;
-
-			for (const auto& pair : temp->GetItems()) {
-				items.push_back(pair.second);
-			}
-
-			for (auto* item : items) {
-				inv->MoveItemToInventory(item, eInventoryType::MODELS, item->GetCount(), false);
-			}
-			});
+	for (auto* item : items) {
+		inv->MoveItemToInventory(item, eInventoryType::MODELS, item->GetCount(), false);
 	}
 }
 

dGame/dInventory/Item.cpp

@@ -19,8 +19,6 @@
 #include "eObjectBits.h"
 #include "eReplicaComponentType.h"
 #include "eUseItemResponse.h"
-#include "dZoneManager.h"
-#include "ChatPackets.h"
 
 #include "CDBrickIDTableTable.h"
 #include "CDObjectSkillsTable.h"
@@ -294,19 +292,12 @@ void Item::UseNonEquip(Item* item) {
 
 	const auto type = static_cast<eItemType>(info->itemType);
 	if (type == eItemType::MOUNT) {
-		if (Game::zoneManager->GetMountsAllowed()){
-			playerInventoryComponent->HandlePossession(this);
-		} else {
-			ChatPackets::SendSystemMessage(playerEntity->GetSystemAddress(), u"Mounts are not allowed in this zone");
-		}
-	} else if (type == eItemType::PET_INVENTORY_ITEM && subKey != LWOOBJID_EMPTY ) {
-		if (Game::zoneManager->GetPetsAllowed()){
-			const auto& databasePet = playerInventoryComponent->GetDatabasePet(subKey);
-			if (databasePet.lot != LOT_NULL) {
-				playerInventoryComponent->SpawnPet(this);
-			}
-		} else {
-			ChatPackets::SendSystemMessage(playerEntity->GetSystemAddress(), u"Pets are not allowed in this zone");
+		playerInventoryComponent->HandlePossession(this);
+		// TODO Check if mounts are allowed to be spawned
+	} else if (type == eItemType::PET_INVENTORY_ITEM && subKey != LWOOBJID_EMPTY) {
+		const auto& databasePet = playerInventoryComponent->GetDatabasePet(subKey);
+		if (databasePet.lot != LOT_NULL) {
+			playerInventoryComponent->SpawnPet(this);
 		}
 		// This precondition response is taken care of in SpawnPet().
 	} else {
@@ -395,13 +386,14 @@ void Item::Disassemble(const eInventoryType inventoryType) {
 	}
 }
 
-void Item::DisassembleModel(uint32_t numToDismantle) {
+void Item::DisassembleModel() {
 	auto* table = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 
 	const auto componentId = table->GetByIDAndType(GetLot(), eReplicaComponentType::RENDER);
 
-	auto query = CDClientDatabase::CreatePreppedStmt("SELECT render_asset, LXFMLFolder FROM RenderComponent WHERE id = ?;");
-	query.bind(1, static_cast<int>(componentId));
+	auto query = CDClientDatabase::CreatePreppedStmt(
+		"SELECT render_asset, LXFMLFolder FROM RenderComponent WHERE id = ?;");
+	query.bind(1, (int)componentId);
 
 	auto result = query.execQuery();
 
@@ -425,6 +417,8 @@ void Item::DisassembleModel(uint32_t numToDismantle) {
 
 	std::istream file(&buffer);
 
+	result.finalize();
+
 	if (!file.good()) {
 		buffer.close();
 		return;
@@ -435,49 +429,39 @@ void Item::DisassembleModel(uint32_t numToDismantle) {
 
 	buffer.close();
 
-	uint32_t fileSize;
-	file.seekg(0, std::ios::end);
-	fileSize = static_cast<uint32_t>(file.tellg());
-	file.seekg(0, std::ios::beg);
-
-	if (fileSize == 0) return;
-
-	tinyxml2::XMLDocument doc;
-
-	if (doc.Parse(data.str().c_str(), data.str().size()) != tinyxml2::XML_SUCCESS) {
+	if (data.str().empty()) {
 		return;
 	}
 
-	auto* lxfml = doc.FirstChildElement("LXFML");
-	if (!lxfml) return;
+	auto* doc = new tinyxml2::XMLDocument();
+
+	if (!doc) {
+		return;
+	}
+
+	if (doc->Parse(data.str().c_str(), data.str().size()) != 0) {
+		return;
+	}
+
+	std::vector<int> parts;
+
+	auto* lxfml = doc->FirstChildElement("LXFML");
 	auto* bricks = lxfml->FirstChildElement("Bricks");
 	std::string searchTerm = "Brick";
 
 	if (!bricks) {
 		searchTerm = "Part";
-		auto* scene = lxfml->FirstChildElement("Scene");
-		if (!scene) return;
+		bricks = lxfml->FirstChildElement("Scene")->FirstChildElement("Model")->FirstChildElement("Group");
 
-		auto* model = scene->FirstChildElement("Model");
-		if (!model) return;
-
-		auto* group = model->FirstChildElement("Group");
-		if (!group) return;
+		if (!bricks) {
+			return;
+		}
 	}
 
 	auto* currentBrick = bricks->FirstChildElement(searchTerm.c_str());
-
-	// First iteration gets the count
-	std::map<int32_t, int32_t> parts;
 	while (currentBrick) {
-		auto* designID = currentBrick->Attribute("designID");
-		if (designID) {
-			uint32_t designId;
-			if (!GeneralUtils::TryParse(designID, designId)) {
-				LOG("Failed to parse designID %s", designID);
-				continue;
-			}
-			parts[designId]++;
+		if (currentBrick->Attribute("designID") != nullptr) {
+			parts.push_back(std::stoi(currentBrick->Attribute("designID")));
 		}
 
 		currentBrick = currentBrick->NextSiblingElement(searchTerm.c_str());
@@ -485,16 +469,16 @@ void Item::DisassembleModel(uint32_t numToDismantle) {
 
 	auto* brickIDTable = CDClientManager::Instance().GetTable<CDBrickIDTableTable>();
 
-	// Second iteration actually distributes the bricks
-	for (const auto&[part, count] : parts) {
-		const auto partLocal = part;
-		const auto brickID = brickIDTable->Query([&](const CDBrickIDTable& entry) {
-			return entry.LEGOBrickID == partLocal;
+	for (unsigned int part : parts) {
+		const auto brickID = brickIDTable->Query([=](const CDBrickIDTable& entry) {
+			return entry.LEGOBrickID == part;
 			});
 
-		if (brickID.empty()) continue;
+		if (brickID.empty()) {
+			continue;
+		}
 
-		GetInventory()->GetComponent()->AddItem(brickID[0].NDObjectID, count * numToDismantle, eLootSourceType::DELETION);
+		GetInventory()->GetComponent()->AddItem(brickID[0].NDObjectID, 1, eLootSourceType::DELETION);
 	}
 }
 

dGame/dInventory/Item.h

@@ -207,7 +207,7 @@ public:
 	/**
 	 * Disassembles this item into bricks
 	 */
-	void DisassembleModel(uint32_t numToDismantle);
+	void DisassembleModel();
 
 	/**
 	 * Removes the item from the linked inventory

dGame/dUtilities/CheatDetection.cpp

@@ -29,7 +29,7 @@ void ReportCheat(User* user, const SystemAddress& sysAddr, const char* messageIf
 	std::unique_ptr<sql::PreparedStatement> stmt(Database::CreatePreppedStmt(
 		"INSERT INTO player_cheat_detections (account_id, name, violation_msg, violation_system_address) VALUES (?, ?, ?, ?)")
 	);
-	user ? stmt->setInt(1, user->GetAccountID()) : stmt->setNull(1, sql::DataType::INTEGER);
+	stmt->setInt(1, user ? user->GetAccountID() : 0);
 	stmt->setString(2, user ? user->GetUsername().c_str() : "User is null.");
 
 	constexpr int32_t bufSize = 4096;

dGame/dUtilities/SlashCommandHandler.cpp

@@ -247,7 +247,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 
 	if (chatCommand == "credits" || chatCommand == "info") {
-		const auto& customText = chatCommand == "credits" ? VanityUtilities::ParseMarkdown((BinaryPathFinder::GetBinaryDir() / "vanity/CREDITS.md").string()) : VanityUtilities::ParseMarkdown((BinaryPathFinder::GetBinaryDir() / "vanity/INFO.md").string());
+		const auto& customText = chatCommand == "credits" ? VanityUtilities::ParseMarkdown((BinaryPathFinder::GetBinaryDir() / "vanity/CREDITS.md").string()) : VanityUtilities::ParseMarkdown((BinaryPathFinder::GetBinaryDir() /  "vanity/INFO.md").string());
 
 		{
 			AMFArrayValue args;
@@ -448,8 +448,9 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if (chatCommand == "kill" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		ChatPackets::SendSystemMessage(sysAddr, u"Brutally murdering that player, if online on this server.");
 
-		auto* player = Player::GetPlayer(args[0]);
-		if (player) {
+		auto* user = UserManager::Instance()->GetUser(args[0]);
+		if (user) {
+			auto* player = Game::entityManager->GetEntity(user->GetLoggedInChar());
 			player->Smash(entity->GetObjectID());
 			ChatPackets::SendSystemMessage(sysAddr, u"It has been done, do you feel good about yourself now?");
 			return;
@@ -1041,7 +1042,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 				}
 			} else {
 				accountId = player->GetParentUser()->GetAccountID();
-				characterId = player->GetObjectID();
+				characterId = player->GetCharacter()->GetID();
 			}
 
 			auto* userUpdate = Database::CreatePreppedStmt("UPDATE accounts SET mute_expire = ? WHERE id = ?;");
@@ -1489,24 +1490,6 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		return;
 	}
 
-	//Testing basic attack immunity
-	if (chatCommand == "attackimmune" && args.size() >= 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
-		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
-
-		int32_t state = false;
-
-		if (!GeneralUtils::TryParse(args[0], state)) {
-			ChatPackets::SendSystemMessage(sysAddr, u"Invalid state.");
-			return;
-		}
-
-		if (destroyableComponent != nullptr) {
-			destroyableComponent->SetIsImmune(state);
-		}
-
-		return;
-	}
-
 	if (chatCommand == "buff" && args.size() >= 2 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		auto* buffComponent = entity->GetComponent<BuffComponent>();
 
@@ -1860,7 +1843,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if (chatCommand == "castskill" && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER && args.size() >= 1) {
 		auto* skillComponent = entity->GetComponent<SkillComponent>();
-		if (skillComponent) {
+		if (skillComponent){
 			uint32_t skillId;
 
 			if (!GeneralUtils::TryParse(args[0], skillId)) {
@@ -1877,7 +1860,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		uint32_t skillId;
 		int slot;
 		auto* inventoryComponent = entity->GetComponent<InventoryComponent>();
-		if (inventoryComponent) {
+		if (inventoryComponent){
 			if (!GeneralUtils::TryParse(args[0], slot)) {
 				ChatPackets::SendSystemMessage(sysAddr, u"Error getting slot.");
 				return;
@@ -1886,7 +1869,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 					ChatPackets::SendSystemMessage(sysAddr, u"Error getting skill.");
 					return;
 				} else {
-					if (inventoryComponent->SetSkill(slot, skillId)) ChatPackets::SendSystemMessage(sysAddr, u"Set skill to slot successfully");
+					if(inventoryComponent->SetSkill(slot, skillId)) ChatPackets::SendSystemMessage(sysAddr, u"Set skill to slot successfully");
 					else ChatPackets::SendSystemMessage(sysAddr, u"Set skill to slot failed");
 				}
 			}
@@ -1895,7 +1878,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if (chatCommand == "setfaction" && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER && args.size() >= 1) {
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
-		if (destroyableComponent) {
+		if (destroyableComponent){
 			int32_t faction;
 
 			if (!GeneralUtils::TryParse(args[0], faction)) {
@@ -1910,7 +1893,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if (chatCommand == "addfaction" && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER && args.size() >= 1) {
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
-		if (destroyableComponent) {
+		if (destroyableComponent){
 			int32_t faction;
 
 			if (!GeneralUtils::TryParse(args[0], faction)) {
@@ -1925,7 +1908,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if (chatCommand == "getfactions" && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
-		if (destroyableComponent) {
+		if (destroyableComponent){
 			ChatPackets::SendSystemMessage(sysAddr, u"Friendly factions:");
 			for (const auto entry : destroyableComponent->GetFactionIDs()) {
 				ChatPackets::SendSystemMessage(sysAddr, (GeneralUtils::to_u16string(entry)));

dGame/dUtilities/VanityUtilities.cpp

@@ -15,10 +15,6 @@
 #include "Logger.h"
 #include "BinaryPathFinder.h"
 #include "EntityInfo.h"
-#include "Spawner.h"
-#include "dZoneManager.h"
-#include "../dWorldServer/ObjectIDManager.h"
-#include "Level.h"
 
 #include <fstream>
 
@@ -33,21 +29,6 @@ void VanityUtilities::SpawnVanity() {
 
 	const uint32_t zoneID = Game::server->GetZoneID();
 
-	for (const auto& npc : m_NPCs) {
-		if (npc.m_ID == LWOOBJID_EMPTY) continue;
-		if (npc.m_LOT == 176){
-			Game::zoneManager->RemoveSpawner(npc.m_ID);
-		} else{
-			auto* entity = Game::entityManager->GetEntity(npc.m_ID);
-			if (!entity) continue;
-			entity->Smash(LWOOBJID_EMPTY, eKillType::VIOLENT);
-		}
-	}
-
-	m_NPCs.clear();
-	m_Parties.clear();
-	m_PartyPhrases.clear();
-
 	ParseXML((BinaryPathFinder::GetBinaryDir() / "vanity/NPC.xml").string());
 
 	// Loop through all parties
@@ -72,7 +53,7 @@ void VanityUtilities::SpawnVanity() {
 
 		// Loop through all locations
 		for (const auto& location : party.m_Locations) {
-		rate = GeneralUtils::GenerateRandomNumber<float>(0, 1);
+			rate = GeneralUtils::GenerateRandomNumber<float>(0, 1);
 			if (0.75f < rate) {
 				continue;
 			}
@@ -85,11 +66,10 @@ void VanityUtilities::SpawnVanity() {
 			}
 
 			auto& npc = npcList[npcIndex];
-			// Skip spawners
-			if (npc.m_LOT == 176) continue;
-			
+
 			taken.push_back(npcIndex);
 
+			// Spawn the NPC
 			LOG("ldf size is %i", npc.ldf.size());
 			if (npc.ldf.empty()) {
 				npc.ldf = {
@@ -99,16 +79,13 @@ void VanityUtilities::SpawnVanity() {
 			}
 
 			// Spawn the NPC
-			if (npc.m_LOT == 176){
-				npc.m_ID = SpawnSpawner(npc.m_LOT, location.m_Position, location.m_Rotation, npc.ldf);
-			} else {
-				auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
-				if (!npc.m_Phrases.empty()) {
-					npcEntity->SetVar<std::vector<std::string>>(u"chats", m_PartyPhrases);
-					SetupNPCTalk(npcEntity);
-				}
+			auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
+			if (!npc.m_Phrases.empty()) {
+				npcEntity->SetVar<std::vector<std::string>>(u"chats", m_PartyPhrases);
+				SetupNPCTalk(npcEntity);
 			}
 		}
+
 		return;
 	}
 
@@ -134,28 +111,23 @@ void VanityUtilities::SpawnVanity() {
 				new LDFData<std::u16string>(u"custom_script_client", u"scripts\\ai\\SPEC\\MISSION_MINIGAME_CLIENT.lua")
 			};
 		}
-		if (npc.m_LOT == 176){
-			npc.m_ID = SpawnSpawner(npc.m_LOT, location.m_Position, location.m_Rotation, npc.ldf);
-		} else {
-			// Spawn the NPC
-			auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
-			if (!npcEntity) continue;
-			npc.m_ID = npcEntity->GetObjectID();
-			if (!npc.m_Phrases.empty()){
-				npcEntity->SetVar<std::vector<std::string>>(u"chats", npc.m_Phrases);
 
-				auto* scriptComponent = npcEntity->GetComponent<ScriptComponent>();
+		// Spawn the NPC
+		auto* npcEntity = SpawnNPC(npc.m_LOT, npc.m_Name, location.m_Position, location.m_Rotation, npc.m_Equipment, npc.ldf);
+		if (!npc.m_Phrases.empty()){
+			npcEntity->SetVar<std::vector<std::string>>(u"chats", npc.m_Phrases);
 
-				if (scriptComponent && !npc.m_Script.empty()) {
-					scriptComponent->SetScript(npc.m_Script);
-					scriptComponent->SetSerialized(false);
+			auto* scriptComponent = npcEntity->GetComponent<ScriptComponent>();
 
-					for (const auto& npc : npc.m_Flags) {
-						npcEntity->SetVar<bool>(GeneralUtils::ASCIIToUTF16(npc.first), npc.second);
-					}
+			if (scriptComponent && !npc.m_Script.empty()) {
+				scriptComponent->SetScript(npc.m_Script);
+				scriptComponent->SetSerialized(false);
+
+				for (const auto& npc : npc.m_Flags) {
+					npcEntity->SetVar<bool>(GeneralUtils::ASCIIToUTF16(npc.first), npc.second);
 				}
-				SetupNPCTalk(npcEntity);
 			}
+			SetupNPCTalk(npcEntity);
 		}
 	}
 
@@ -177,21 +149,8 @@ void VanityUtilities::SpawnVanity() {
 	}
 }
 
-LWOOBJID VanityUtilities::SpawnSpawner(LOT lot, const NiPoint3& position, const NiQuaternion& rotation, const std::vector<LDFBaseData*>& ldf){
-	SceneObject obj;
-	obj.lot = lot;
-	// guratantee we have no collisions
-	do {
-		obj.id = ObjectIDManager::Instance()->GenerateObjectID();
-	} while(Game::zoneManager->GetSpawner(obj.id));
-	obj.position = position;
-	obj.rotation = rotation;
-	obj.settings = ldf;
-	Level::MakeSpawner(obj);
-	return obj.id;
-}
-
-Entity* VanityUtilities::SpawnNPC(LOT lot, const std::string& name, const NiPoint3& position, const NiQuaternion& rotation, const std::vector<LOT>& inventory, const std::vector<LDFBaseData*>& ldf) {
+Entity* VanityUtilities::SpawnNPC(LOT lot, const std::string& name, const NiPoint3& position,
+	const NiQuaternion& rotation, const std::vector<LOT>& inventory, const std::vector<LDFBaseData*>& ldf) {
 	EntityInfo info;
 	info.lot = lot;
 	info.pos = position;

dGame/dUtilities/VanityUtilities.h

@@ -13,7 +13,6 @@ struct VanityNPCLocation
 
 struct VanityNPC
 {
-	LWOOBJID m_ID = LWOOBJID_EMPTY;
 	std::string m_Name;
 	LOT m_LOT;
 	std::vector<LOT> m_Equipment;
@@ -45,13 +44,6 @@ public:
 		const std::vector<LDFBaseData*>& ldf
 	);
 
-	static LWOOBJID SpawnSpawner(
-		LOT lot,
-		const NiPoint3& position,
-		const NiQuaternion& rotation,
-		const std::vector<LDFBaseData*>& ldf
-	);
-
 	static std::string ParseMarkdown(
 		const std::string& file
 	);

dMasterServer/MasterServer.cpp

@@ -154,7 +154,7 @@ int main(int argc, char** argv) {
 		Game::assetManager = new AssetManager(clientPath);
 	} catch (std::runtime_error& ex) {
 		LOG("Got an error while setting up assets: %s", ex.what());
-		LOG("Is the provided client_location in Windows Onedrive? If so, remove it from Onedrive.");
+
 		return EXIT_FAILURE;
 	}
 

dNet/ClientPackets.cpp

@@ -34,7 +34,6 @@
 #include "eGameMasterLevel.h"
 #include "eReplicaComponentType.h"
 #include "CheatDetection.h"
-#include "Amf3.h"
 
 void ClientPackets::HandleChatMessage(const SystemAddress& sysAddr, Packet* packet) {
 	User* user = UserManager::Instance()->GetUser(sysAddr);
@@ -403,40 +402,3 @@ void ClientPackets::HandleChatModerationRequest(const SystemAddress& sysAddr, Pa
 	user->SetLastChatMessageApproved(bAllClean);
 	WorldPackets::SendChatModerationResponse(sysAddr, bAllClean, requestID, receiver, segments);
 }
-
-void ClientPackets::SendTop5HelpIssues(Packet* packet) {
-	auto* user = UserManager::Instance()->GetUser(packet->systemAddress);
-	if (!user) return;
-	auto* character = user->GetLastUsedChar();
-	if (!character) return;
-	auto * entity = character->GetEntity();
-	if (!entity) return;
-
-	CINSTREAM_SKIP_HEADER;
-	int32_t language = 0;
-	inStream.Read(language);
-
-	// TODO: Handle different languages in a nice way
-	// 0: en_US
-	// 1: pl_US
-	// 2: de_DE
-	// 3: en_GB
-
-	AMFArrayValue data;
-	// Summaries
-	data.Insert("Summary0", Game::config->GetValue("help_0_summary"));
-	data.Insert("Summary1", Game::config->GetValue("help_1_summary"));
-	data.Insert("Summary2", Game::config->GetValue("help_2_summary"));
-	data.Insert("Summary3", Game::config->GetValue("help_3_summary"));
-	data.Insert("Summary4", Game::config->GetValue("help_4_summary"));
-
-	// Descriptions
-	data.Insert("Description0", Game::config->GetValue("help_0_description"));
-	data.Insert("Description1", Game::config->GetValue("help_1_description"));
-	data.Insert("Description2", Game::config->GetValue("help_2_description"));
-	data.Insert("Description3", Game::config->GetValue("help_3_description"));
-	data.Insert("Description4", Game::config->GetValue("help_4_description"));
-	
-	GameMessages::SendUIMessageServerToSingleClient(entity, packet->systemAddress, "UIHelpTop5", data);
-	
-}

dNet/ClientPackets.h

@@ -12,7 +12,6 @@ namespace ClientPackets {
 	void HandleChatMessage(const SystemAddress& sysAddr, Packet* packet);
 	void HandleClientPositionUpdate(const SystemAddress& sysAddr, Packet* packet);
 	void HandleChatModerationRequest(const SystemAddress& sysAddr, Packet* packet);
-	void SendTop5HelpIssues(Packet* packet);
 };
 
 #endif // CLIENTPACKETS_H

dScripts/02_server/Map/NT/NtCombatChallengeExplodingDummy.cpp

@@ -1,7 +1,6 @@
 #include "NtCombatChallengeExplodingDummy.h"
 #include "EntityManager.h"
 #include "SkillComponent.h"
-#include "DestroyableComponent.h"
 
 void NtCombatChallengeExplodingDummy::OnDie(Entity* self, Entity* killer) {
 	const auto challengeObjectID = self->GetVar<LWOOBJID>(u"challengeObjectID");
@@ -16,17 +15,6 @@ void NtCombatChallengeExplodingDummy::OnDie(Entity* self, Entity* killer) {
 }
 
 void NtCombatChallengeExplodingDummy::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t damage) {
-	auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
-	auto numTimesHit = self->GetVar<int32_t>(u"numTimesHit");
-	if (destroyableComponent && numTimesHit == 0) {
-		self->SetVar<int32_t>(u"numTimesHit", 1);
-		destroyableComponent->SetHealth(destroyableComponent->GetHealth() / 2);
-		return;
-	} else if (numTimesHit == 2) {
-		return;
-	}
-	self->SetVar<int32_t>(u"numTimesHit", 2);
-
 	const auto challengeObjectID = self->GetVar<LWOOBJID>(u"challengeObjectID");
 
 	auto* challengeObject = Game::entityManager->GetEntity(challengeObjectID);
@@ -40,6 +28,5 @@ void NtCombatChallengeExplodingDummy::OnHitOrHealResult(Entity* self, Entity* at
 	if (skillComponent != nullptr) {
 		skillComponent->CalculateBehavior(1338, 30875, attacker->GetObjectID());
 	}
-	GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(self, u"camshake", self->GetObjectID(), 16.0f);
-	self->Smash(attacker->GetObjectID());
+	self->Kill(attacker);
 }

dWorldServer/PerformanceManager.cpp

@@ -1,6 +1,5 @@
 #include "PerformanceManager.h"
-#include "CDZoneTableTable.h"
-#include "CDClientManager.h"
+
 #include "UserManager.h"
 
 #define SOCIAL { lowFrameDelta }
@@ -69,30 +68,11 @@ std::map<LWOMAPID, PerformanceProfile> PerformanceManager::m_Profiles = {
 };
 
 void PerformanceManager::SelectProfile(LWOMAPID mapID) {
-	// Try to get it from zoneTable
-	CDZoneTableTable* zoneTable = CDClientManager::Instance().GetTable<CDZoneTableTable>();
-	if (zoneTable) {
-		const CDZoneTable* zone = zoneTable->Query(mapID);
-		if (zone) {
-			if (zone->serverPhysicsFramerate == "high"){
-				m_CurrentProfile = { highFrameDelta };
-				return;
-			}
-			if (zone->serverPhysicsFramerate == "medium"){
-				m_CurrentProfile = { mediumFrameDelta };
-				return;
-			}
-			if (zone->serverPhysicsFramerate == "low"){
-				m_CurrentProfile = { lowFrameDelta };
-				return;
-			}
-		}
-	}
-
-	// Fall back to hardcoded list and defaults
 	const auto pair = m_Profiles.find(mapID);
+
 	if (pair == m_Profiles.end()) {
 		m_CurrentProfile = m_DefaultProfile;
+
 		return;
 	}
 

dWorldServer/WorldServer.cpp

@@ -925,7 +925,7 @@ void HandlePacket(Packet* packet) {
 		//We need to delete the entity first, otherwise the char list could delete it while it exists in the world!
 		if (Game::server->GetZoneID() != 0) {
 			auto user = UserManager::Instance()->GetUser(packet->systemAddress);
-			if (!user || !user->GetLastUsedChar()) return;
+			if (!user) return;
 			Game::entityManager->DestroyEntity(user->GetLastUsedChar()->GetEntity());
 		}
 
@@ -1297,12 +1297,6 @@ void HandlePacket(Packet* packet) {
 		break;
 	}
 
-
-	case eWorldMessageType::UI_HELP_TOP_5: {
-		ClientPackets::SendTop5HelpIssues(packet);
-		break;
-	}
-
 	default:
 		LOG("Unknown world packet received: %i", int(packet->data[3]));
 	}

dZoneManager/Level.cpp

@@ -38,76 +38,6 @@ Level::~Level() {
 	}
 }
 
-void Level::MakeSpawner(SceneObject obj){
-	SpawnerInfo spawnInfo = SpawnerInfo();
-	SpawnerNode* node = new SpawnerNode();
-	spawnInfo.templateID = obj.lot;
-	spawnInfo.spawnerID = obj.id;
-	spawnInfo.templateScale = obj.scale;
-	node->position = obj.position;
-	node->rotation = obj.rotation;
-	node->config = obj.settings;
-	spawnInfo.nodes.push_back(node);
-	for (LDFBaseData* data : obj.settings) {
-	if (data) {
-		if (data->GetKey() == u"spawntemplate") {
-			spawnInfo.templateID = std::stoi(data->GetValueAsString());
-		}
-
-		if (data->GetKey() == u"spawner_node_id") {
-			node->nodeID = std::stoi(data->GetValueAsString());
-		}
-
-		if (data->GetKey() == u"spawner_name") {
-			spawnInfo.name = data->GetValueAsString();
-		}
-
-		if (data->GetKey() == u"max_to_spawn") {
-			spawnInfo.maxToSpawn = std::stoi(data->GetValueAsString());
-		}
-
-		if (data->GetKey() == u"spawner_active_on_load") {
-			spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-		}
-
-		if (data->GetKey() == u"active_on_load") {
-			spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
-		}
-
-		if (data->GetKey() == u"respawn") {
-			if (data->GetValueType() == eLDFType::LDF_TYPE_FLOAT) // Floats are in seconds
-			{
-				spawnInfo.respawnTime = std::stof(data->GetValueAsString());
-			} else if (data->GetValueType() == eLDFType::LDF_TYPE_U32) // Ints are in ms?
-			{
-				spawnInfo.respawnTime = std::stoul(data->GetValueAsString()) / 1000;
-			}
-		}
-		if (data->GetKey() == u"spawnsGroupOnSmash") {
-			spawnInfo.spawnsOnSmash = std::stoi(data->GetValueAsString());
-		}
-		if (data->GetKey() == u"spawnNetNameForSpawnGroupOnSmash") {
-			spawnInfo.spawnOnSmashGroupName = data->GetValueAsString();
-		}
-		if (data->GetKey() == u"groupID") { // Load object groups
-			std::string groupStr = data->GetValueAsString();
-			spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
-			spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
-		}
-		if (data->GetKey() == u"no_auto_spawn") {
-			spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-		}
-		if (data->GetKey() == u"no_timed_spawn") {
-			spawnInfo.noTimedSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
-		}
-		if (data->GetKey() == u"spawnActivator") {
-			spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
-		}
-	}
-	}
-	Game::zoneManager->MakeSpawner(spawnInfo);
-}
-
 const void Level::PrintAllObjects() {
 	for (std::map<uint32_t, Header>::iterator it = m_ChunkHeaders.begin(); it != m_ChunkHeaders.end(); ++it) {
 		if (it->second.id == Level::ChunkTypeID::SceneObjectData) {
@@ -300,7 +230,74 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 		}
 
 		if (obj.lot == 176) { //Spawner
-			MakeSpawner(obj);
+			SpawnerInfo spawnInfo = SpawnerInfo();
+			SpawnerNode* node = new SpawnerNode();
+			spawnInfo.templateID = obj.lot;
+			spawnInfo.spawnerID = obj.id;
+			spawnInfo.templateScale = obj.scale;
+			node->position = obj.position;
+			node->rotation = obj.rotation;
+			node->config = obj.settings;
+			spawnInfo.nodes.push_back(node);
+			for (LDFBaseData* data : obj.settings) {
+				if (data) {
+					if (data->GetKey() == u"spawntemplate") {
+						spawnInfo.templateID = std::stoi(data->GetValueAsString());
+					}
+
+					if (data->GetKey() == u"spawner_node_id") {
+						node->nodeID = std::stoi(data->GetValueAsString());
+					}
+
+					if (data->GetKey() == u"spawner_name") {
+						spawnInfo.name = data->GetValueAsString();
+					}
+
+					if (data->GetKey() == u"max_to_spawn") {
+						spawnInfo.maxToSpawn = std::stoi(data->GetValueAsString());
+					}
+
+					if (data->GetKey() == u"spawner_active_on_load") {
+						spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
+					}
+
+					if (data->GetKey() == u"active_on_load") {
+						spawnInfo.activeOnLoad = std::stoi(data->GetValueAsString());
+					}
+
+					if (data->GetKey() == u"respawn") {
+						if (data->GetValueType() == eLDFType::LDF_TYPE_FLOAT) // Floats are in seconds
+						{
+							spawnInfo.respawnTime = std::stof(data->GetValueAsString());
+						} else if (data->GetValueType() == eLDFType::LDF_TYPE_U32) // Ints are in ms?
+						{
+							spawnInfo.respawnTime = std::stoul(data->GetValueAsString()) / 1000;
+						}
+					}
+					if (data->GetKey() == u"spawnsGroupOnSmash") {
+						spawnInfo.spawnsOnSmash = std::stoi(data->GetValueAsString());
+					}
+					if (data->GetKey() == u"spawnNetNameForSpawnGroupOnSmash") {
+						spawnInfo.spawnOnSmashGroupName = data->GetValueAsString();
+					}
+					if (data->GetKey() == u"groupID") { // Load object groups
+						std::string groupStr = data->GetValueAsString();
+						spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
+						spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
+					}
+					if (data->GetKey() == u"no_auto_spawn") {
+						spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
+					}
+					if (data->GetKey() == u"no_timed_spawn") {
+						spawnInfo.noTimedSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
+					}
+					if (data->GetKey() == u"spawnActivator") {
+						spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
+					}
+				}
+			}
+			Spawner* spawner = new Spawner(spawnInfo);
+			Game::zoneManager->AddSpawner(obj.id, spawner);
 		} else { //Regular object
 			EntityInfo info;
 			info.spawnerID = 0;

dZoneManager/Level.h

@@ -53,8 +53,6 @@ public:
 public:
 	Level(Zone* parentZone, const std::string& filepath);
 	~Level();
-	
-	static void MakeSpawner(SceneObject obj);
 
 	const void PrintAllObjects();
 

dZoneManager/dZoneManager.cpp

@@ -40,9 +40,6 @@ void dZoneManager::Initialize(const LWOZONEID& zoneID) {
 			Game::entityManager->SetGhostDistanceMax(max + min);
 			Game::entityManager->SetGhostDistanceMin(max);
 			m_PlayerLoseCoinsOnDeath = zone->PlayerLoseCoinsOnDeath;
-			m_DisableSaveLocation = zone->disableSaveLoc;
-			m_MountsAllowed = zone->mountsAllowed;
-			m_PetsAllowed = zone->petsAllowed;
 		}
 	}
 

dZoneManager/dZoneManager.h

@@ -41,9 +41,6 @@ public:
 	void Update(float deltaTime);
 	Entity* GetZoneControlObject() { return m_ZoneControlObject; }
 	bool GetPlayerLoseCoinOnDeath() { return m_PlayerLoseCoinsOnDeath; }
-	bool GetDisableSaveLocation() { return m_DisableSaveLocation; }
-	bool GetMountsAllowed() { return m_MountsAllowed; }
-	bool GetPetsAllowed() { return m_PetsAllowed; }
 	uint32_t GetUniqueMissionIdStartingValue();
 	bool CheckIfAccessibleZone(LWOMAPID zoneID);
 
@@ -61,10 +58,7 @@ private:
 
 	Zone* m_pZone = nullptr;
 	LWOZONEID m_ZoneID;
-	bool m_PlayerLoseCoinsOnDeath = false;
-	bool m_DisableSaveLocation = false;
-	bool m_MountsAllowed = true;
-	bool m_PetsAllowed = true;
+	bool m_PlayerLoseCoinsOnDeath; //Do players drop coins in this zone when smashed
 	std::map<LWOOBJID, Spawner*> m_Spawners;
 	WorldConfig* m_WorldConfig = nullptr;
 

docs/Commands.md

@@ -25,7 +25,6 @@
 |ban|`/ban <username>`|Bans a user from the server.|4|
 |approveproperty|`/approveproperty`|Approves the property the player is currently visiting.|5|
 |mute|`/mute <username> (days) (hours)`|Mute player for the given amount of time. If no time is given, the mute is indefinite.|6|
-|attackimmune|`/attackimmune <value>`|Sets the character's immunity to basic attacks state, where value can be one of "1", to make yourself immune to basic attack damage, or "0" to undo.|8|
 |gmimmune|`/gmimmunve <value>`|Sets the character's GMImmune state, where value can be one of "1", to make yourself immune to damage, or "0" to undo.|8|
 |gminvis|`/gminvis`|Toggles invisibility for the character, though it's currently a bit buggy. Requires nonzero GM Level for the character, but the account must have a GM level of 8.|8|
 |setname|`/setname <name>`|Sets a temporary name for your player. The name resets when you log out.|8|

migrations/dlu/12_modular_build_ugc.sql

@@ -1,5 +0,0 @@
-CREATE TABLE IF NOT EXISTS ugc_modular_build (
-	ugc_id BIGINT NOT NULL PRIMARY KEY,
-	character_id BIGINT NOT NULL REFERENCES charinfo(id) ON DELETE CASCADE,
-	ldf_config VARCHAR(60) NOT NULL
-);

resources/worldconfig.ini

@@ -64,15 +64,3 @@ allow_nameplate_off=0
 
 # Turn logging of IP addresses for anti-cheat reporting on (1) or off(0)
 log_ip_addresses_for_anti_cheat=1
-
-help_0_summary=Got an issue?
-help_1_summary=Stuck loading?
-help_2_summary=Missing features?
-help_3_summary=Get smashed?
-help_4_summary=Want to contribute?
-
-help_0_description=Go to the DarkflameServer repository on GitHub to view issues and discussions about the server emulator!<br/><br/><a href="https://github.com/DarkflameUniverse/DarkflameServer"><font color="#0000EE">Click Here to go there!</font></a><br/><br/>
-help_1_description=Try switching networks, using a VPN, or using your phone's hotspot to resolve the issue.<br/><br/>
-help_2_description=While DarkflameServer is a mostly complete emulator, there are still some features that aren't implemented. You can track these on the GitHub issues page.<br/><br/>
-help_3_description=Skill issue!<br/><br/>
-help_4_description=Visit Discussions on the DarkflameServer GitHub page<br/>to ask questions and collaborate with other devs!<br/><br/>

systemd.example

@@ -1,19 +0,0 @@
-[Unit]
-# Description of the service.
-Description=Darkflame LEGO Universe Server
-# Wait for network to start first before starting this service.
-After=network.target
-
-[Service]
-Type=simple
-# Services should have their own, dedicated, user account.
-# The specific user that our service will run as, you can find your current user by issuing `id -un`
-User=darkflame
-# The specific group that our service will run as, you can find your current primary group by issuing `id -gn`
-Group=darkflame
-# Full Path to the darkflame server process
-ExecStart=/PATH/TO/DarkflameServer/build/MasterServer
-
-[Install]
-# Define the behavior if the service is enabled or disabled to automatically started at boot.
-WantedBy=multi-user.target

tests/dGameTests/dComponentsTests/DestroyableComponentTests.cpp

@@ -536,22 +536,3 @@ TEST_F(DestroyableTest, DestroyableComponentImmunityTest) {
 
 }
 
-/**
- * Test the Damage cooldown timer of DestroyableComponent
- */
-TEST_F(DestroyableTest, DestroyableComponentDamageCooldownTest) {
-	// Test the damage immune timer state (anything above 0.0f)
-	destroyableComponent->SetDamageCooldownTimer(1.0f);
-	EXPECT_FLOAT_EQ(destroyableComponent->GetDamageCooldownTimer(), 1.0f);
-	ASSERT_TRUE(destroyableComponent->IsCooldownImmune());
-
-	// Test that the Update() function correctly decrements the damage cooldown timer
-	destroyableComponent->Update(0.5f);
-	EXPECT_FLOAT_EQ(destroyableComponent->GetDamageCooldownTimer(), 0.5f);
-	ASSERT_TRUE(destroyableComponent->IsCooldownImmune());
-
-	// Test the non damage immune timer state (anything below or equal to 0.0f)
-	destroyableComponent->SetDamageCooldownTimer(0.0f);
-	EXPECT_FLOAT_EQ(destroyableComponent->GetDamageCooldownTimer(), 0.0f);
-	ASSERT_FALSE(destroyableComponent->IsCooldownImmune());
-}