[Release] 22.10.0 (#3300 )

[Bug Fix] Camping was causing player to leave raid, causing unexpected behavior (#3299 )
Fix crash when Removing empty password protected channel. (#3298 )
2026-05-27 04:42:27 +00:00 · 2023-04-22 10:17:20 -04:00 · 2023-04-22 10:03:40 -04:00 · 2023-04-22 08:49:34 -04:00 · 2023-04-22 08:49:13 -04:00 · 2023-04-16 10:26:19 -04:00
226 changed files with 2969 additions and 4453 deletions
@@ -1,3 +1,193 @@
+## [22.10.0] - 04/22/2023
+
+### Backups
+
+* Fix database dump error reporting ([#3175](https://github.com/EQEmu/Server/pull/3175)) @Akkadius 2023-04-04
+
+### Bots
+
+* Cleanup GetBotTables() ([#3270](https://github.com/EQEmu/Server/pull/3270)) @Aeadoin 2023-04-06
+
+### Cleanuo
+
+* Only define row if we have results in Database::GetCharacterID() ([#3199](https://github.com/EQEmu/Server/pull/3199)) @Kinglykrab 2023-04-05
+
+### Code
+
+* Add missing breaks and returns in bonuses.cpp ([#3231](https://github.com/EQEmu/Server/pull/3231)) @Kinglykrab 2023-04-05
+* Breaks in wrong spot in cases in spell_effects.cpp ([#3297](https://github.com/EQEmu/Server/pull/3297)) @Kinglykrab 2023-04-22
+* Cleanup always true/false statements in shareddb.cpp ([#3189](https://github.com/EQEmu/Server/pull/3189)) @Kinglykrab 2023-04-05
+* Cleanup cheap-to-copy reference to use value instead in eq_stream_ident.cpp/eq_stream_ident.h ([#3209](https://github.com/EQEmu/Server/pull/3209)) @Kinglykrab 2023-04-05
+* Cleanup discord.cpp and discord_manager.cpp ([#3205](https://github.com/EQEmu/Server/pull/3205)) @Kinglykrab 2023-04-05
+* Cleanup duplicate conditions in negate bonuses in bonuses.cpp ([#3226](https://github.com/EQEmu/Server/pull/3226)) @Kinglykrab 2023-04-05
+* Cleanup item_instance.cpp always true statements and reassigning of same values ([#3187](https://github.com/EQEmu/Server/pull/3187)) @Kinglykrab 2023-04-05
+* Cleanup macros in features.h ([#3185](https://github.com/EQEmu/Server/pull/3185)) @Kinglykrab 2023-04-05
+* Cleanup string -> char* -> string conversions in bot_command.cpp ([#3252](https://github.com/EQEmu/Server/pull/3252)) @Kinglykrab 2023-04-05
+* Cleanup unnecessary condition in Client::SendAlternateCurrencyValue() ([#3266](https://github.com/EQEmu/Server/pull/3266)) @Kinglykrab 2023-04-05
+* Cleanup zone/zoning.cpp ([#3289](https://github.com/EQEmu/Server/pull/3289)) @Kinglykrab 2023-04-14
+* Combine similar cases in Client::InitInnates() ([#3260](https://github.com/EQEmu/Server/pull/3260)) @Kinglykrab 2023-04-05
+* Convert equipable_slot_list to std::vector from std::list in bot_command.cpp ([#3253](https://github.com/EQEmu/Server/pull/3253)) @Kinglykrab 2023-04-05
+* Delete embxs.cpp/embxs.h ([#3284](https://github.com/EQEmu/Server/pull/3284)) @Kinglykrab 2023-04-14
+* Delete unused strings in bot_command.cpp ([#3251](https://github.com/EQEmu/Server/pull/3251)) @Kinglykrab 2023-04-05
+* Fix GetLastName() length check in Client::SendWindow() ([#3263](https://github.com/EQEmu/Server/pull/3263)) @Kinglykrab 2023-04-05
+* Fix always false conditions in Client::IncStats() ([#3256](https://github.com/EQEmu/Server/pull/3256)) @Kinglykrab 2023-04-05
+* Fix check for !this in Client::SendHPUpdateMarquee() ([#3257](https://github.com/EQEmu/Server/pull/3257)) @Kinglykrab 2023-04-05
+* Fix filter condition in attack.cpp ([#3218](https://github.com/EQEmu/Server/pull/3218)) @Kinglykrab 2023-04-05
+* Fix ornamentation augment icons in inspect requests ([#3264](https://github.com/EQEmu/Server/pull/3264)) @Kinglykrab 2023-04-05
+* Fix possible nullptr inst in GetSharedBank() ([#3190](https://github.com/EQEmu/Server/pull/3190)) @Kinglykrab 2023-04-08
+* Fix possible overflows in Client::AddPlatinum() and Client::TakePlatinum() ([#3255](https://github.com/EQEmu/Server/pull/3255)) @Kinglykrab 2023-04-05
+* Fix shared_tasks.cpp/shared_tasks.cpp variable named same as class member ([#3192](https://github.com/EQEmu/Server/pull/3192)) @Kinglykrab 2023-04-05
+* Fix skill_used being used as boolean in Mob::CommonDamage() ([#3220](https://github.com/EQEmu/Server/pull/3220)) @Kinglykrab 2023-04-05
+* Identical conditions right beside each other in aa.cpp ([#3213](https://github.com/EQEmu/Server/pull/3213)) @Kinglykrab 2023-04-05
+* Move unreachable code in ApplySpellsBonuses() ([#3229](https://github.com/EQEmu/Server/pull/3229)) @Kinglykrab 2023-04-05
+* Move variable definition to more relevant scope in DatabaseDumpService::Dump() ([#3200](https://github.com/EQEmu/Server/pull/3200)) @Kinglykrab 2023-04-05
+* Multiple cases with same outcome in GetDiscordPayloadFromEvent() ([#3184](https://github.com/EQEmu/Server/pull/3184)) @Kinglykrab 2023-04-05
+* Remove ExportVarComplex() from embparser.cpp/embparser.h ([#3282](https://github.com/EQEmu/Server/pull/3282)) @Kinglykrab 2023-04-14
+* Remove GetQGlobal() from qglobals.cpp/qglobals.h ([#3285](https://github.com/EQEmu/Server/pull/3285)) @Kinglykrab 2023-04-14
+* Remove IsFullHP from mob.cpp/mob.h ([#3277](https://github.com/EQEmu/Server/pull/3277)) @Kinglykrab 2023-04-14
+* Remove IsMeleeDmg() from skills.cpp/skills.h ([#3279](https://github.com/EQEmu/Server/pull/3279)) @Kinglykrab 2023-04-14
+* Remove _GetMovementSpeed() from mob.h ([#3276](https://github.com/EQEmu/Server/pull/3276)) @Kinglykrab 2023-04-14
+* Remove always true condition in Strings::Commify() ([#3193](https://github.com/EQEmu/Server/pull/3193)) @Kinglykrab 2023-04-05
+* Remove always true conditions and unreachable code in Client::SendMercPersonalInfo() ([#3258](https://github.com/EQEmu/Server/pull/3258)) @Kinglykrab 2023-04-05
+* Remove always true statement in say_link.cpp ([#3188](https://github.com/EQEmu/Server/pull/3188)) @Kinglykrab 2023-04-05
+* Remove always true statements in task_client_state.cpp ([#3292](https://github.com/EQEmu/Server/pull/3292)) @Kinglykrab 2023-04-14
+* Remove always true/false conditions from bot.cpp ([#3237](https://github.com/EQEmu/Server/pull/3237)) @Kinglykrab 2023-04-05
+* Remove bool return from GetSharedPlatinum() ([#3191](https://github.com/EQEmu/Server/pull/3191)) @Kinglykrab 2023-04-05
+* Remove extra assignment of current_endurance in Client ctor ([#3261](https://github.com/EQEmu/Server/pull/3261)) @Kinglykrab 2023-04-05
+* Remove extraneous check for NegateAttacks in SE_NegateAttacks ([#3228](https://github.com/EQEmu/Server/pull/3228)) @Kinglykrab 2023-04-05
+* Remove extraneous parentheses around math in Mob::ApplySpellsBonuses() ([#3227](https://github.com/EQEmu/Server/pull/3227)) @Kinglykrab 2023-04-05
+* Remove getd(), geti(), InUse(), lasterr(), my_get_sv(), and VarExists() in embperl.cpp/embperl.h ([#3283](https://github.com/EQEmu/Server/pull/3283)) @Kinglykrab 2023-04-15
+* Remove item_timers from questmgr.cpp/questmgr.h ([#3286](https://github.com/EQEmu/Server/pull/3286)) @Kinglykrab 2023-04-14
+* Remove pendinggroup from mob.h ([#3278](https://github.com/EQEmu/Server/pull/3278)) @Kinglykrab 2023-04-14
+* Remove position_same_update_count from client.cpp/client.h ([#3280](https://github.com/EQEmu/Server/pull/3280)) @Kinglykrab 2023-04-14
+* Remove unnecessary break in while loop in Mob::AddToHateList() ([#3219](https://github.com/EQEmu/Server/pull/3219)) @Kinglykrab 2023-04-05
+* Remove unnecessary check for IsStackable() in DeleteItem() ([#3186](https://github.com/EQEmu/Server/pull/3186)) @Kinglykrab 2023-04-05
+* Remove unnecessary condition and cleanup variable name in tasks.cpp ([#3293](https://github.com/EQEmu/Server/pull/3293)) @Kinglykrab 2023-04-14
+* Remove unnecessary conditions in Client::Consume() ([#3265](https://github.com/EQEmu/Server/pull/3265)) @Kinglykrab 2023-04-05
+* Remove unnecessary conditions in Client::FilteredMessageCheck() ([#3262](https://github.com/EQEmu/Server/pull/3262)) @Kinglykrab 2023-04-05
+* Remove unnecessary conditions in Client::SendFactionMessage() ([#3267](https://github.com/EQEmu/Server/pull/3267)) @Kinglykrab 2023-04-05
+* Remove unnecessary setting of reuse variable in Bot::DoClassAttacks() ([#3233](https://github.com/EQEmu/Server/pull/3233)) @Kinglykrab 2023-04-05
+* Remove unused SetConfigFile in common/eqemu_config.h ([#3208](https://github.com/EQEmu/Server/pull/3208)) @Kinglykrab 2023-04-05
+* Remove unused code in eq_packet.cpp/eq_packet.h ([#3183](https://github.com/EQEmu/Server/pull/3183)) @Kinglykrab 2023-04-05
+* Remove unused ctor and use default dtor in xtargetautohaters.h ([#3290](https://github.com/EQEmu/Server/pull/3290)) @Kinglykrab 2023-04-14
+* Remove unused macros in common/types.h ([#3194](https://github.com/EQEmu/Server/pull/3194)) @Kinglykrab 2023-04-05
+* Remove unused variable in Database::CopyCharacter() ([#3197](https://github.com/EQEmu/Server/pull/3197)) @Kinglykrab 2023-04-05
+* Remove unused variables and use reference in task_manager.cpp ([#3291](https://github.com/EQEmu/Server/pull/3291)) @Kinglykrab 2023-04-14
+* SE_AttackSpeed3 effect_value is always less than 0 ([#3222](https://github.com/EQEmu/Server/pull/3222)) @Kinglykrab 2023-04-05
+* SE_StrikeThrough and SE_StrikeThrough2 are the same in bonuses.cpp ([#3223](https://github.com/EQEmu/Server/pull/3223)) @Kinglykrab 2023-04-05
+* Set bonuses to use spell ID instead of boolean ([#3230](https://github.com/EQEmu/Server/pull/3230)) @Kinglykrab 2023-04-05
+* Use .clear() and .empty() instead of comparing to empty string or setting to empty string in CheckDatabaseConvertPPBlob() ([#3201](https://github.com/EQEmu/Server/pull/3201)) @Kinglykrab 2023-04-05
+* Use .clear() instead of setting string to empty in eqemu_command_handler.cpp ([#3195](https://github.com/EQEmu/Server/pull/3195)) @Kinglykrab 2023-04-05
+* Use .empty() in Client::ScribeSpells() and Client::LearnDisciplines() ([#3259](https://github.com/EQEmu/Server/pull/3259)) @Kinglykrab 2023-04-05
+* Use constant reference and check for empty string properly in dbcore.cpp ([#3203](https://github.com/EQEmu/Server/pull/3203)) @Kinglykrab 2023-04-05
+* Use default ctor instead of an empty ctor. ([#3206](https://github.com/EQEmu/Server/pull/3206)) @Kinglykrab 2023-04-05
+* Use default dtor instead of empty dtor for EQTime in eqtime.cpp/eqtime.h ([#3210](https://github.com/EQEmu/Server/pull/3210)) @Kinglykrab 2023-04-05
+* Use variable for c->GetTarget() instead of calling multiple times in bot_command.cpp ([#3254](https://github.com/EQEmu/Server/pull/3254)) @Kinglykrab 2023-04-05
+* Use variable for character instead of a loop ([#3268](https://github.com/EQEmu/Server/pull/3268)) @Kinglykrab 2023-04-05
+* Utilize .empty() instead of checking for an empty string in Database::ReserveName() ([#3198](https://github.com/EQEmu/Server/pull/3198)) @Kinglykrab 2023-04-05
+* Utilize IsTaunting(), SetPetPower(), SetPetType(), and SetTaunting() ([#3275](https://github.com/EQEmu/Server/pull/3275)) @Kinglykrab 2023-04-15
+* Validate for nullptrs in bot.cpp ([#3232](https://github.com/EQEmu/Server/pull/3232)) @Kinglykrab 2023-04-05
+* other is always defined in these cases in attack.cpp ([#3217](https://github.com/EQEmu/Server/pull/3217)) @Kinglykrab 2023-04-05
+* results variable is assigned but never used in SaveCharacterCreate() ([#3180](https://github.com/EQEmu/Server/pull/3180)) @Kinglykrab 2023-04-05
+
+### Crash
+
+* Add additional raid integrity checks on Bot Spawn. ([#3295](https://github.com/EQEmu/Server/pull/3295)) @Aeadoin 2023-04-16
+* Fix crash with uninitialized item instance, and Bot timeout ([#3296](https://github.com/EQEmu/Server/pull/3296)) @Aeadoin 2023-04-15
+* Resolve crash due to uninitialized pointer. ([#3271](https://github.com/EQEmu/Server/pull/3271)) @Aeadoin 2023-04-08
+
+### Feature
+
+* Make ornamentations work with any augment type ([#3281](https://github.com/EQEmu/Server/pull/3281)) @Kinglykrab 2023-04-16
+
+### Fixes
+
+* Camping was causing player to leave raid, causing unexpected behavior ([#3299](https://github.com/EQEmu/Server/pull/3299)) @Aeadoin 2023-04-22
+* Resolve loading of inventory ([#3272](https://github.com/EQEmu/Server/pull/3272)) @Aeadoin 2023-04-08
+
+### Quest API
+
+* Add ApplySpellRaid() and SetSpellDurationRaid() to Bots in Perl/Lua ([#3274](https://github.com/EQEmu/Server/pull/3274)) @Kinglykrab 2023-04-09
+* Add GetBuffSpellIDs() to Perl/Lua ([#3273](https://github.com/EQEmu/Server/pull/3273)) @Kinglykrab 2023-04-09
+* Fix LDoN Methods in Perl/Lua ([#3287](https://github.com/EQEmu/Server/pull/3287)) @Kinglykrab 2023-04-10
+
+### Rules
+
+* Optional summoning when already in melee range ([#3204](https://github.com/EQEmu/Server/pull/3204)) @trentdm 2023-04-08
+
+### Telnet
+
+* Telnet encoding fix ([#3269](https://github.com/EQEmu/Server/pull/3269)) @Akkadius 2023-04-05
+
+## [22.9.1] - 04/03/2023 
+
+### Code
+
+* Add client pointer validation to Zone::GetClosestZonePoint() ([#3173](https://github.com/EQEmu/Server/pull/3173)) @Kinglykrab 2023-04-01
+* Change level to bot_level in Bot::DoClassAttacks() to not overlap member variable ([#3239](https://github.com/EQEmu/Server/pull/3239)) @Kinglykrab 2023-04-03
+* Cleanup unnecessary string -> char* -> string conversions in eqemu_config.cpp ([#3207](https://github.com/EQEmu/Server/pull/3207)) @Kinglykrab 2023-04-03
+* Cleanup uses of insert/push_back when a temp object is used. ([#3170](https://github.com/EQEmu/Server/pull/3170)) @Aeadoin 2023-04-03
+* Cleanup variable names in Bot::AddSpellToBotList() ([#3248](https://github.com/EQEmu/Server/pull/3248)) @Kinglykrab 2023-04-03
+* Explicitly cast to float for more precision in Bot::GenerateBastHitPoints() ([#3238](https://github.com/EQEmu/Server/pull/3238)) @Kinglykrab 2023-04-03
+* Fix SEResist array settings duplicate code ([#3225](https://github.com/EQEmu/Server/pull/3225)) @Kinglykrab 2023-04-03
+* Fix loop and code duplication for SE_ProcOnKillShot ([#3224](https://github.com/EQEmu/Server/pull/3224)) @Kinglykrab 2023-04-03
+* Fix possible dereferencing of invalid iterator in constants ([#3181](https://github.com/EQEmu/Server/pull/3181)) @Kinglykrab 2023-04-03
+* Fix typo where itembonuses should have been used instead of spellbonuses ([#3221](https://github.com/EQEmu/Server/pull/3221)) @Kinglykrab 2023-04-03
+* Further bot.cpp nullptr checks ([#3240](https://github.com/EQEmu/Server/pull/3240)) @Kinglykrab 2023-04-03
+* Move cases in Bot::AICastSpell() ([#3247](https://github.com/EQEmu/Server/pull/3247)) @Kinglykrab 2023-04-03
+* Multiple cases same outcome and set skip variable to same value ([#3216](https://github.com/EQEmu/Server/pull/3216)) @Kinglykrab 2023-04-03
+* Multiple cases with same outcome in GetGMSayColorFromCategory() ([#3182](https://github.com/EQEmu/Server/pull/3182)) @Kinglykrab 2023-04-03
+* Remove extraneous loottable_id setting in WakeTheDead in aa.cpp ([#3215](https://github.com/EQEmu/Server/pull/3215)) @Kinglykrab 2023-04-03
+* Remove possible dereferenced nullptrs in bot.cpp ([#3241](https://github.com/EQEmu/Server/pull/3241)) @Kinglykrab 2023-04-03
+* Remove unnecessary >= 0 checks for procs in botspellsai.cpp ([#3242](https://github.com/EQEmu/Server/pull/3242)) @Kinglykrab 2023-04-03
+* Remove unnecessary botCaster check in Bot::GetDebuffBotSpell() ([#3246](https://github.com/EQEmu/Server/pull/3246)) @Kinglykrab 2023-04-03
+* Remove unnecessary group validation in Bot::Death() ([#3235](https://github.com/EQEmu/Server/pull/3235)) @Kinglykrab 2023-04-03
+* Remove unnecessary hpr checks in Bot::BotCastHeal() ([#3245](https://github.com/EQEmu/Server/pull/3245)) @Kinglykrab 2023-04-03
+* Remove unnecessary setting of spell_type_index in Bot::GetChanceToCastBySpellType() ([#3243](https://github.com/EQEmu/Server/pull/3243)) @Kinglykrab 2023-04-03
+* Remove unnecessary skill_to_use check in Bot::DoClassAttacks() ([#3236](https://github.com/EQEmu/Server/pull/3236)) @Kinglykrab 2023-04-03
+* Remove unnecessary spell_list validation check in botspellsai.cpp ([#3244](https://github.com/EQEmu/Server/pull/3244)) @Kinglykrab 2023-04-03
+* Remove unnecessary validation check in Zone::ClearBlockedSpells() ([#3172](https://github.com/EQEmu/Server/pull/3172)) @Kinglykrab 2023-04-01
+* Remove unused Includes under zone files ([#3162](https://github.com/EQEmu/Server/pull/3162)) @Aeadoin 2023-04-02
+* Remove unused query variable in Database::DeleteInstance() ([#3202](https://github.com/EQEmu/Server/pull/3202)) @Kinglykrab 2023-04-03
+* Unconditional return in for loop in GetRaidByCharID() ([#3179](https://github.com/EQEmu/Server/pull/3179)) @Kinglykrab 2023-04-03
+* Use a constant reference for content_flags in SetContentFlags() ([#3196](https://github.com/EQEmu/Server/pull/3196)) @Kinglykrab 2023-04-03
+* Wake The Dead argument was named the same as a member variable in Mob ([#3214](https://github.com/EQEmu/Server/pull/3214)) @Kinglykrab 2023-04-03
+* gid is assigned 2 values simultaneously in bot.cpp ([#3234](https://github.com/EQEmu/Server/pull/3234)) @Kinglykrab 2023-04-03
+* summon_count > MAX_SWARM_PETS  is always false in aa.cpp ([#3212](https://github.com/EQEmu/Server/pull/3212)) @Kinglykrab 2023-04-03
+
+### Fixes
+
+* Correct Forward Declaration compilation warning ([#3176](https://github.com/EQEmu/Server/pull/3176)) @Aeadoin 2023-04-02
+* Fix issue with Bot Raid invites not working. ([#3249](https://github.com/EQEmu/Server/pull/3249)) @Aeadoin 2023-04-03
+
+### Performance
+
+* Change to use Pass by reference where valid. ([#3163](https://github.com/EQEmu/Server/pull/3163)) @Aeadoin 2023-04-02
+
+## [22.9.0] - 04/01/2023 
+
+### Bots
+
+* Remove Bot Groups Functionality ([#3165](https://github.com/EQEmu/Server/pull/3165)) @Aeadoin 2023-04-01
+
+### Code
+
+* Cleanup excessive type casting: string -> char * -> string ([#3169](https://github.com/EQEmu/Server/pull/3169)) @Aeadoin 2023-04-01
+
+### Crash
+
+* Add Checks for valid pointers or fix existing. ([#3164](https://github.com/EQEmu/Server/pull/3164)) @Aeadoin 2023-04-01
+* Fix out of bound arrays, other potential crashes ([#3166](https://github.com/EQEmu/Server/pull/3166)) @Aeadoin 2023-04-01
+
+### Fixes
+
+* Correct SE_SlayUndead & SE_HeadShotLevel limit Value when applied. ([#3171](https://github.com/EQEmu/Server/pull/3171)) @Aeadoin 2023-04-01
+* Prevent VerifyGroup from setting OOZ membername to Null character. ([#3168](https://github.com/EQEmu/Server/pull/3168)) @Aeadoin 2023-04-01
+
+### Quest API
+
+* Add missing Luabind definitions to lua_general.cpp ([#3167](https://github.com/EQEmu/Server/pull/3167)) @Kinglykrab 2023-04-01
+
 ## [22.8.2] - 03/30/2023 

 ### Code
@@ -160,7 +160,7 @@ namespace EQEmuCommand {
 			 */
 			std::string command_section;
 			for (auto   &it: in_function_map) {
-				description = "";
+				description.clear();

 				(it.second)(argc, argv, cmd, description);

@@ -120,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
 * @param content_flags
 */
-void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
+void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -167,7 +167,7 @@ public:
 	std::vector<std::string> GetContentFlagsDisabled();
 	bool IsContentFlagEnabled(const std::string& content_flag);
 	bool IsContentFlagDisabled(const std::string& content_flag);
-	void SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
+	void SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags);
 	void ReloadContentFlags();
 	WorldContentService * SetExpansionContext();

@@ -125,7 +125,7 @@ public:
 		StackWalker::OnOutput(szText);
 	}

-	const std::vector<std::string>& const GetLines() { return _lines; }
+	const std::vector<std::string>& GetLines() { return _lines; }
 private:
 	std::vector<std::string> _lines;
 };
@@ -353,7 +353,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {

 	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
-	if (!results.Success() || results.ErrorMessage() != ""){ return false; }
+	if (!results.Success() || !results.ErrorMessage().empty()){ return false; }

 	// Put character into the default guild if rule is being used.
 	int guild_id = RuleI(Character, DefaultGuild);
@@ -363,7 +363,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 		if (character_id > -1) {
 			query = StringFormat("INSERT INTO `guild_members` SET `char_id` = %i, `guild_id` = '%i'", character_id, guild_id);
 			results = QueryDatabase(query);
-			if (!results.Success() || results.ErrorMessage() != ""){
+			if (!results.Success() || !results.ErrorMessage().empty()){
 				LogInfo("Could not put character [{}] into default Guild", name);
 			}
 		}
@@ -449,7 +449,8 @@ bool Database::DeleteCharacter(char *character_name)
 	return true;
 }

-bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp){
+bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp)
+{
 	std::string query = StringFormat(
 		"REPLACE INTO `character_data` ("
 		"id,"
@@ -634,101 +635,102 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"%u,"  // guild_auto_consent
 		"%u"  // RestTimer
 		")",
-		character_id,					  // " id,                        "
-		account_id,						  // " account_id,                "
-		Strings::Escape(pp->name).c_str(),	  // " `name`,                    "
+		character_id,                      // " id,                        "
+		account_id,                          // " account_id,                "
+		Strings::Escape(pp->name).c_str(),      // " `name`,                    "
 		Strings::Escape(pp->last_name).c_str(), // " last_name,              "
-		pp->gender,						  // " gender,                    "
-		pp->race,						  // " race,                      "
-		pp->class_,						  // " class,                     "
-		pp->level,						  // " `level`,                   "
-		pp->deity,						  // " deity,                     "
-		pp->birthday,					  // " birthday,                  "
-		pp->lastlogin,					  // " last_login,                "
-		pp->timePlayedMin,				  // " time_played,               "
-		pp->pvp,						  // " pvp_status,                "
-		pp->level2,						  // " level2,                    "
-		pp->anon,						  // " anon,                      "
-		pp->gm,							  // " gm,                        "
-		pp->intoxication,				  // " intoxication,              "
-		pp->haircolor,					  // " hair_color,                "
-		pp->beardcolor,					  // " beard_color,               "
-		pp->eyecolor1,					  // " eye_color_1,               "
-		pp->eyecolor2,					  // " eye_color_2,               "
-		pp->hairstyle,					  // " hair_style,                "
-		pp->beard,						  // " beard,                     "
-		pp->ability_time_seconds,		  // " ability_time_seconds,      "
-		pp->ability_number,				  // " ability_number,            "
-		pp->ability_time_minutes,		  // " ability_time_minutes,      "
-		pp->ability_time_hours,			  // " ability_time_hours,        "
+		pp->gender,                          // " gender,                    "
+		pp->race,                          // " race,                      "
+		pp->class_,                          // " class,                     "
+		pp->level,                          // " `level`,                   "
+		pp->deity,                          // " deity,                     "
+		pp->birthday,                      // " birthday,                  "
+		pp->lastlogin,                      // " last_login,                "
+		pp->timePlayedMin,                  // " time_played,               "
+		pp->pvp,                          // " pvp_status,                "
+		pp->level2,                          // " level2,                    "
+		pp->anon,                          // " anon,                      "
+		pp->gm,                              // " gm,                        "
+		pp->intoxication,                  // " intoxication,              "
+		pp->haircolor,                      // " hair_color,                "
+		pp->beardcolor,                      // " beard_color,               "
+		pp->eyecolor1,                      // " eye_color_1,               "
+		pp->eyecolor2,                      // " eye_color_2,               "
+		pp->hairstyle,                      // " hair_style,                "
+		pp->beard,                          // " beard,                     "
+		pp->ability_time_seconds,          // " ability_time_seconds,      "
+		pp->ability_number,                  // " ability_number,            "
+		pp->ability_time_minutes,          // " ability_time_minutes,      "
+		pp->ability_time_hours,              // " ability_time_hours,        "
 		Strings::Escape(pp->title).c_str(),  // " title,                     "
 		Strings::Escape(pp->suffix).c_str(), // " suffix,                    "
-		pp->exp,						  // " exp,                       "
-		pp->points,						  // " points,                    "
-		pp->mana,						  // " mana,                      "
-		pp->cur_hp,						  // " cur_hp,                    "
-		pp->STR,						  // " str,                       "
-		pp->STA,						  // " sta,                       "
-		pp->CHA,						  // " cha,                       "
-		pp->DEX,						  // " dex,                       "
-		pp->INT,						  // " `int`,                     "
-		pp->AGI,						  // " agi,                       "
-		pp->WIS,						  // " wis,                       "
-		pp->face,						  // " face,                      "
-		pp->y,							  // " y,                         "
-		pp->x,							  // " x,                         "
-		pp->z,							  // " z,                         "
-		pp->heading,					  // " heading,                   "
-		pp->pvp2,						  // " pvp2,                      "
-		pp->pvptype,					  // " pvp_type,                  "
-		pp->autosplit,					  // " autosplit_enabled,         "
-		pp->zone_change_count,			  // " zone_change_count,         "
-		pp->drakkin_heritage,			  // " drakkin_heritage,          "
-		pp->drakkin_tattoo,				  // " drakkin_tattoo,            "
-		pp->drakkin_details,			  // " drakkin_details,           "
-		pp->toxicity,					  // " toxicity,                  "
-		pp->hunger_level,				  // " hunger_level,              "
-		pp->thirst_level,				  // " thirst_level,              "
-		pp->ability_up,					  // " ability_up,                "
-		pp->zone_id,					  // " zone_id,                   "
-		pp->zoneInstance,				  // " zone_instance,             "
-		pp->leadAAActive,				  // " leadership_exp_on,         "
-		pp->ldon_points_guk,			  // " ldon_points_guk,           "
-		pp->ldon_points_mir,			  // " ldon_points_mir,           "
-		pp->ldon_points_mmc,			  // " ldon_points_mmc,           "
-		pp->ldon_points_ruj,			  // " ldon_points_ruj,           "
-		pp->ldon_points_tak,			  // " ldon_points_tak,           "
-		pp->ldon_points_available,		  // " ldon_points_available,     "
-		pp->tribute_time_remaining,		  // " tribute_time_remaining,    "
-		pp->showhelm,					  // " show_helm,                 "
-		pp->career_tribute_points,		  // " career_tribute_points,     "
-		pp->tribute_points,				  // " tribute_points,            "
-		pp->tribute_active,				  // " tribute_active,            "
-		pp->endurance,					  // " endurance,                 "
-		pp->group_leadership_exp,		  // " group_leadership_exp,      "
-		pp->raid_leadership_exp,		  // " raid_leadership_exp,       "
-		pp->group_leadership_points,	  // " group_leadership_points,   "
-		pp->raid_leadership_points,		  // " raid_leadership_points,    "
-		pp->air_remaining,				  // " air_remaining,             "
-		pp->PVPKills,					  // " pvp_kills,                 "
-		pp->PVPDeaths,					  // " pvp_deaths,                "
-		pp->PVPCurrentPoints,			  // " pvp_current_points,        "
-		pp->PVPCareerPoints,			  // " pvp_career_points,         "
-		pp->PVPBestKillStreak,			  // " pvp_best_kill_streak,      "
-		pp->PVPWorstDeathStreak,		  // " pvp_worst_death_streak,    "
-		pp->PVPCurrentKillStreak,		  // " pvp_current_kill_streak,   "
-		pp->aapoints_spent,				  // " aa_points_spent,           "
-		pp->expAA,						  // " aa_exp,                    "
-		pp->aapoints,					  // " aa_points,                 "
-		pp->groupAutoconsent,			  // " group_auto_consent,        "
-		pp->raidAutoconsent,			  // " raid_auto_consent,         "
-		pp->guildAutoconsent,			  // " guild_auto_consent,        "
-		pp->RestTimer					  // " RestTimer)                 "
+		pp->exp,                          // " exp,                       "
+		pp->points,                          // " points,                    "
+		pp->mana,                          // " mana,                      "
+		pp->cur_hp,                          // " cur_hp,                    "
+		pp->STR,                          // " str,                       "
+		pp->STA,                          // " sta,                       "
+		pp->CHA,                          // " cha,                       "
+		pp->DEX,                          // " dex,                       "
+		pp->INT,                          // " `int`,                     "
+		pp->AGI,                          // " agi,                       "
+		pp->WIS,                          // " wis,                       "
+		pp->face,                          // " face,                      "
+		pp->y,                              // " y,                         "
+		pp->x,                              // " x,                         "
+		pp->z,                              // " z,                         "
+		pp->heading,                      // " heading,                   "
+		pp->pvp2,                          // " pvp2,                      "
+		pp->pvptype,                      // " pvp_type,                  "
+		pp->autosplit,                      // " autosplit_enabled,         "
+		pp->zone_change_count,              // " zone_change_count,         "
+		pp->drakkin_heritage,              // " drakkin_heritage,          "
+		pp->drakkin_tattoo,                  // " drakkin_tattoo,            "
+		pp->drakkin_details,              // " drakkin_details,           "
+		pp->toxicity,                      // " toxicity,                  "
+		pp->hunger_level,                  // " hunger_level,              "
+		pp->thirst_level,                  // " thirst_level,              "
+		pp->ability_up,                      // " ability_up,                "
+		pp->zone_id,                      // " zone_id,                   "
+		pp->zoneInstance,                  // " zone_instance,             "
+		pp->leadAAActive,                  // " leadership_exp_on,         "
+		pp->ldon_points_guk,              // " ldon_points_guk,           "
+		pp->ldon_points_mir,              // " ldon_points_mir,           "
+		pp->ldon_points_mmc,              // " ldon_points_mmc,           "
+		pp->ldon_points_ruj,              // " ldon_points_ruj,           "
+		pp->ldon_points_tak,              // " ldon_points_tak,           "
+		pp->ldon_points_available,          // " ldon_points_available,     "
+		pp->tribute_time_remaining,          // " tribute_time_remaining,    "
+		pp->showhelm,                      // " show_helm,                 "
+		pp->career_tribute_points,          // " career_tribute_points,     "
+		pp->tribute_points,                  // " tribute_points,            "
+		pp->tribute_active,                  // " tribute_active,            "
+		pp->endurance,                      // " endurance,                 "
+		pp->group_leadership_exp,          // " group_leadership_exp,      "
+		pp->raid_leadership_exp,          // " raid_leadership_exp,       "
+		pp->group_leadership_points,      // " group_leadership_points,   "
+		pp->raid_leadership_points,          // " raid_leadership_points,    "
+		pp->air_remaining,                  // " air_remaining,             "
+		pp->PVPKills,                      // " pvp_kills,                 "
+		pp->PVPDeaths,                      // " pvp_deaths,                "
+		pp->PVPCurrentPoints,              // " pvp_current_points,        "
+		pp->PVPCareerPoints,              // " pvp_career_points,         "
+		pp->PVPBestKillStreak,              // " pvp_best_kill_streak,      "
+		pp->PVPWorstDeathStreak,          // " pvp_worst_death_streak,    "
+		pp->PVPCurrentKillStreak,          // " pvp_current_kill_streak,   "
+		pp->aapoints_spent,                  // " aa_points_spent,           "
+		pp->expAA,                          // " aa_exp,                    "
+		pp->aapoints,                      // " aa_points,                 "
+		pp->groupAutoconsent,              // " group_auto_consent,        "
+		pp->raidAutoconsent,              // " raid_auto_consent,         "
+		pp->guildAutoconsent,              // " guild_auto_consent,        "
+		pp->RestTimer                      // " RestTimer)                 "
 	);
-	auto results = QueryDatabase(query);
+	QueryDatabase(query);

 	/* Save Bind Points */
-	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+	query = StringFormat(
+		"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -739,57 +741,73 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		character_id, pp->binds[2].zone_id, 0, pp->binds[2].x, pp->binds[2].y, pp->binds[2].z, pp->binds[2].heading, 2,
 		character_id, pp->binds[3].zone_id, 0, pp->binds[3].x, pp->binds[3].y, pp->binds[3].z, pp->binds[3].heading, 3,
 		character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 4
-	); results = QueryDatabase(query);
+	);
+	QueryDatabase(query);

-        /* HoTT Ability */
-        if(RuleB(Character, GrantHoTTOnCreate))
-        {
-                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)", character_id, 14, 1);
-                results = QueryDatabase(query);
-        }
+	/* HoTT Ability */
+	if (RuleB(Character, GrantHoTTOnCreate)) {
+		query = StringFormat(
+			"INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)",
+			character_id,
+			14,
+			1
+		);
+		QueryDatabase(query);
+	}

 	/* Save Skills */
-	int firstquery = 0;
-	for (int i = 0; i < MAX_PP_SKILL; i++){
-		if (pp->skills[i] > 0){
-			if (firstquery != 1){
+	int      firstquery = 0;
+	for (int i          = 0; i < MAX_PP_SKILL; i++) {
+		if (pp->skills[i] > 0) {
+			if (firstquery != 1) {
 				firstquery = 1;
-				query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, i, pp->skills[i]);
-			}
-			else{
+				query      = StringFormat(
+					"REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)",
+					character_id,
+					i,
+					pp->skills[i]
+				);
+			} else {
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->skills[i]);
 			}
 		}
 	}
-	results = QueryDatabase(query);
+	QueryDatabase(query);

 	/* Save Language */
 	firstquery = 0;
-	for (int i = 0; i < MAX_PP_LANGUAGE; i++){
-		if (pp->languages[i] > 0){
-			if (firstquery != 1){
+	for (int i = 0; i < MAX_PP_LANGUAGE; i++) {
+		if (pp->languages[i] > 0) {
+			if (firstquery != 1) {
 				firstquery = 1;
-				query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, i, pp->languages[i]);
-			}
-			else{
+				query      = StringFormat(
+					"REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)",
+					character_id,
+					i,
+					pp->languages[i]
+				);
+			} else {
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->languages[i]);
 			}
 		}
 	}
-	results = QueryDatabase(query);
+	QueryDatabase(query);

 	return true;
 }

 uint32 Database::GetCharacterID(const char *name) {
-	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
+	const auto query = fmt::format(
+		"SELECT `id` FROM `character_data` WHERE `name` = '{}'",
+		Strings::Escape(name)
+	);
 	auto results = QueryDatabase(query);
-	auto row = results.begin();
-	if (results.RowCount() == 1)
-	{
-		return Strings::ToUnsignedInt(row[0]);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
 	}
-	return 0;
+
+	auto row = results.begin();
+	return Strings::ToUnsignedInt(row[0]);
 }

 /*
@@ -999,7 +1017,7 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 	return false;
 }

-bool Database::SetVariable(const std::string varname, const std::string &varvalue)
+bool Database::SetVariable(const std::string& varname, const std::string &varvalue)
 {
 	std::string escaped_name = Strings::Escape(varname);
 	std::string escaped_value = Strings::Escape(varvalue);
@@ -2043,10 +2061,12 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 		character_id
 	);
 	auto results = QueryDatabase(query);
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		return Strings::ToUnsignedInt(row[0]);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
 	}
-	return 0;
+
+	auto row = results.begin();
+	return Strings::ToUnsignedInt(row[0]);
 }

 int Database::CountInvSnapshots() {
@@ -2272,7 +2292,6 @@ bool Database::CopyCharacter(
 			new_rows.emplace_back(new_values);
 		}

-		std::string              insert_values;
 		std::vector<std::string> insert_rows;

 		for (auto &r: new_rows) {
@@ -2345,7 +2364,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur

 			int sourced_queries = 0;

-			if (auto res = cli.Get(request_uri.get_path().c_str())) {
+			if (auto res = cli.Get(request_uri.get_path())) {
 				if (res->status == 200) {
 					for (auto &s: Strings::Split(res->body, ';')) {
 						if (!Strings::Trim(s).empty()) {
@@ -235,7 +235,7 @@ public:
 	/* Database Variables */

 	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string varname, const std::string &varvalue);
+	bool	SetVariable(const std::string& varname, const std::string &varvalue);
 	bool	LoadVariables();

 	/* General Queries */
@@ -28,6 +28,7 @@
 #include "../database_schema.h"
 #include "../file.h"
 #include "../process/process.h"
+#include "../termcolor/rang.hpp"

 #include <ctime>

@@ -36,6 +37,7 @@
 #else

 #include <sys/time.h>
+#include <thread>

 #endif

@@ -145,7 +147,7 @@ std::string DatabaseDumpService::GetQueryServTables()

 std::string DatabaseDumpService::GetSystemTablesList()
 {
-	auto system_tables = DatabaseSchema::GetServerTables();
+	auto system_tables  = DatabaseSchema::GetServerTables();
 	auto version_tables = DatabaseSchema::GetVersionTables();

 	system_tables.insert(
@@ -199,7 +201,7 @@ std::string DatabaseDumpService::GetDumpFileNameWithPath()
 	return GetSetDumpPath() + GetDumpFileName();
 }

-void DatabaseDumpService::Dump()
+void DatabaseDumpService::DatabaseDump()
 {
 	if (!IsMySQLInstalled()) {
 		LogError("MySQL is not installed; Please check your PATH for a valid MySQL installation");
@@ -293,14 +295,6 @@ void DatabaseDumpService::Dump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}

-	std::string execute_command = fmt::format(
-		"{} {} {} {}",
-		GetBaseMySQLDumpCommand(),
-		options,
-		tables_to_dump,
-		pipe_file
-	);
-
 	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
 		File::Makedir(GetSetDumpPath());
 	}
@@ -308,7 +302,7 @@ void DatabaseDumpService::Dump()
 	if (IsDumpDropTableSyntaxOnly()) {
 		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');

-		for (auto &table : tables) {
+		for (auto &table: tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;
 		}

@@ -317,12 +311,40 @@ void DatabaseDumpService::Dump()
 		}
 	}
 	else {
+		const auto execute_command = fmt::format(
+			"{} {} {} {}",
+			GetBaseMySQLDumpCommand(),
+			options,
+			tables_to_dump,
+			pipe_file
+		);
+
 		std::string execution_result = Process::execute(execute_command);
 		if (!execution_result.empty() && IsDumpOutputToConsole()) {
 			std::cout << execution_result;
 		}
 	}

+	LogSys.EnableConsoleLogging();
+
+	if (!pipe_file.empty()) {
+		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
+		auto        r    = File::GetContents(file);
+		if (!r.error.empty()) {
+			LogError("{}", r.error);
+		}
+
+		for (auto &line: Strings::Split(r.contents, "\n")) {
+			if (Strings::Contains(line, "mysqldump:")) {
+				LogError("{}", line);
+				LogError("Database dump failed. Correct the error before continuing or trying again");
+				LogError("This is to prevent data loss on behalf of the server operator");
+				RemoveSqlBackup();
+				std::exit(1);
+			}
+		}
+	}
+
 	if (!tables_to_dump.empty()) {
 		LogInfo("Dumping Tables [{}]", Strings::Trim(tables_to_dump));
 	}
@@ -343,6 +365,7 @@ void DatabaseDumpService::Dump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.tar.gz]", GetDumpFileNameWithPath());
+				RemoveSqlBackup();
 			}
 			else if (Is7ZipAvailable()) {
 				Process::execute(
@@ -353,6 +376,7 @@ void DatabaseDumpService::Dump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.zip]", GetDumpFileNameWithPath());
+				RemoveSqlBackup();
 			}
 			else {
 				LogInfo("Compression requested, but no available compression binary was found");
@@ -535,3 +559,11 @@ void DatabaseDumpService::SetDumpMercTables(bool dump_merc_tables)
 {
 	DatabaseDumpService::dump_merc_tables = dump_merc_tables;
 }
+
+void DatabaseDumpService::RemoveSqlBackup()
+{
+	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
+	if (File::Exists(file)) {
+		std::filesystem::remove(file);
+	}
+}
@@ -24,7 +24,7 @@

 class DatabaseDumpService {
 public:
-	void Dump();
+	void DatabaseDump();
 	bool IsDumpAllTables() const;
 	void SetDumpAllTables(bool dump_all_tables);
 	bool IsDumpWithNoData() const;
@@ -92,6 +92,7 @@ private:
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
 	std::string GetQueryServTables();
+	void RemoveSqlBackup();
 };


@@ -967,7 +967,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				loadbar(char_iter_count, number_of_characters, 50);

 				/* Run inspect message convert  */
-				if (inspectmessage != ""){
+				if (!inspectmessage.empty()){
 					std::string rquery = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message)"
 						"VALUES (%u, '%s')",
 						character_id,
@@ -1314,7 +1314,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				The speed difference is dramatic
 				*/
 				/* Run AA Convert */
-				int first_entry = 0; rquery = "";
+				int first_entry = 0; rquery.clear();
 				for (i = 0; i < MAX_PP_AA_ARRAY; i++){
 					if (pp->aa_array[i].AA > 0 && pp->aa_array[i].value > 0){
 						if (first_entry != 1){
@@ -1327,14 +1327,14 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						}
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }

 				/* Run Bind Home Convert */
 				if (pp->binds[4].zone_id < 999 && !_ISNAN_(pp->binds[4].x) && !_ISNAN_(pp->binds[4].y) && !_ISNAN_(pp->binds[4].z) && !_ISNAN_(pp->binds[4].heading)) {
 					rquery = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
 						" VALUES (%u, %u, %u, %f, %f, %f, %f, 1)",
 						character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading);
-					if (rquery != ""){ results = QueryDatabase(rquery); }
+					if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				}

 				/* Run Bind Convert */
@@ -1342,10 +1342,10 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 					rquery = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, is_home)"
 						" VALUES (%u, %u, %u, %f, %f, %f, %f, 0)",
 						character_id, pp->binds[0].zone_id, 0, pp->binds[0].x, pp->binds[0].y, pp->binds[0].z, pp->binds[0].heading);
-					if (rquery != ""){ results = QueryDatabase(rquery); }
+					if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				}
 				/* Run Language Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < MAX_PP_LANGUAGE; i++){
 					if (pp->languages[i] > 0){
 						if (first_entry != 1){
@@ -1355,9 +1355,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, i, pp->languages[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Skill Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < MAX_PP_SKILL; i++){
 					if (pp->skills[i] > 0){
 						if (first_entry != 1){
@@ -1367,9 +1367,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, i, pp->skills[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Spell Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < 480; i++){
 					if (pp->spell_book[i] > 0 && pp->spell_book[i] != 4294967295 && pp->spell_book[i] < 40000 && pp->spell_book[i] != 1){
 						if (first_entry != 1){
@@ -1379,9 +1379,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, i, pp->spell_book[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Max Memmed Spell Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < 9; i++){
 					if (pp->mem_spells[i] > 0 && pp->mem_spells[i] != 65535 && pp->mem_spells[i] != 4294967295){
 						if (first_entry != 1){
@@ -1391,9 +1391,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, i, pp->mem_spells[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Discipline Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < MAX_PP_DISCIPLINES; i++){
 					if (pp->disciplines.values[i] > 0 && pp->disciplines.values[i] < 60000){
 						if (first_entry != 1){
@@ -1403,9 +1403,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, i, pp->disciplines.values[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Material Color Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = EQ::textures::textureBegin; i < EQ::textures::materialCount; i++){
 					if (pp->item_tint[i].color > 0){
 						if (first_entry != 1){
@@ -1415,9 +1415,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u, %u, %u, %u, %u)", character_id, i, pp->item_tint[i].rgb.blue, pp->item_tint[i].rgb.green, pp->item_tint[i].rgb.red, pp->item_tint[i].rgb.use_tint, pp->item_tint[i].color);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Tribute Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < 5; i++){
 					if (pp->tributes[i].tribute > 0 && pp->tributes[i].tribute != 4294967295){
 						if (first_entry != 1){
@@ -1427,9 +1427,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Bandolier Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < Convert::BANDOLIERS_SIZE; i++){
 					if (strlen(pp->bandoliers[i].Name) < 32) {
 						for (int si = 0; si < Convert::BANDOLIER_ITEM_COUNT; si++){
@@ -1443,9 +1443,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						}
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Potion Belt Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < Convert::POTION_BELT_ITEM_COUNT; i++){
 					if (pp->potionbelt.Items[i].ID > 0){
 						if (first_entry != 1){
@@ -1456,9 +1456,9 @@ bool Database::CheckDatabaseConvertPPDeblob(){

 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 				/* Run Leadership AA Convert */
-				first_entry = 0; rquery = "";
+				first_entry = 0; rquery.clear();
 				for (i = 0; i < MAX_LEADERSHIP_AA_ARRAY; i++){
 					if (pp->leader_abilities.ranks[i] > 0 && pp->leader_abilities.ranks[i] < 6){
 						if (first_entry != 1){
@@ -1468,7 +1468,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 						rquery = rquery + StringFormat(", (%i, %u, %u)", character_id, i, pp->leader_abilities.ranks[i]);
 					}
 				}
-				if (rquery != ""){ results = QueryDatabase(rquery); }
+				if (!rquery.empty()){ results = QueryDatabase(rquery); }
 			}
 		}
 		if (runconvert == 1){
@@ -1672,10 +1672,10 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						dbpc->item_tint[8].color,
 						Strings::ToUnsignedInt(row2[0])
 						);
-					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }
+					if (!scquery.empty()){ auto sc_results = QueryDatabase(scquery); }

 					first_entry = 0;
-					scquery = "";
+					scquery.clear();
 					/* Print Items */
 					for (unsigned int i = 0; i < dbpc->itemcount; i++) {
 						if (first_entry != 1){
@@ -1712,7 +1712,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 								);
 						}
 					}
-					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }
+					if (!scquery.empty()){ auto sc_results = QueryDatabase(scquery); }
 				}
 				else{
 					/* Classic Converter */
@@ -1780,10 +1780,10 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						dbpc_c->item_tint[8].color,
 						Strings::ToUnsignedInt(row2[0])
 						);
-					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }
+					if (!scquery.empty()){ auto sc_results = QueryDatabase(scquery); }

 					first_entry = 0;
-					scquery = "";
+					scquery.clear();

 					/* Print Items */
 					for (unsigned int i = 0; i < dbpc_c->itemcount; i++) {
@@ -1821,7 +1821,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 								);
 						}
 					}
-					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }
+					if (!scquery.empty()){ auto sc_results = QueryDatabase(scquery); }
 				}
 			}
 		}
@@ -429,8 +429,6 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)

 void Database::DeleteInstance(uint16 instance_id)
 {
-	std::string query;
-
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));

 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
@@ -392,9 +392,6 @@ namespace DatabaseSchema {
 			"bot_command_settings",
 			"bot_create_combinations",
 			"bot_data",
-			"bot_group_members",
-			"bot_groups",
-			"bot_guild_members",
 			"bot_heal_rotation_members",
 			"bot_heal_rotation_targets",
 			"bot_heal_rotations",
@@ -74,13 +74,13 @@ void DBcore::ping()
 	m_mutex->unlock();
 }

-MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(const std::string& query, bool retryOnFailureOnce)
 {
 	auto r = QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 	return r;
 }

-bool DBcore::DoesTableExist(std::string table_name)
+bool DBcore::DoesTableExist(const std::string& table_name)
 {
 	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));

@@ -136,7 +136,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		/**
 		 * Error logging
 		 */
-		if (mysql_errno(mysql) > 0 && strlen(query) > 0) {
+		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
 			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}

@@ -24,7 +24,7 @@ public:
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
 	MySQLRequestResult QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabase(std::string query, bool retryOnFailureOnce = true);
+	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
 	void TransactionBegin();
 	void TransactionCommit();
 	void TransactionRollback();
@@ -35,7 +35,7 @@ public:
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);

-	bool DoesTableExist(std::string table_name);
+	bool DoesTableExist(const std::string& table_name);

 	void SetMySQL(const DBcore &o)
 	{
@@ -27,9 +27,6 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
-	httplib::Headers headers = {
-		{"Content-Type", "application/json"}
-	};

 	// payload
 	Json::Value p;
@@ -96,9 +93,6 @@ void Discord::SendPlayerEventMessage(
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
-	httplib::Headers headers = {
-		{"Content-Type", "application/json"}
-	};

 	std::string payload = PlayerEventLogs::GetDiscordPayloadFromEvent(e);
 	if (payload.empty()) {
@@ -37,7 +37,7 @@ void DiscordManager::ProcessMessageQueue()
 					message,
 					webhook.webhook_url
 				);
-				message = "";
+				message.clear();
 			}

 			message += m;
@@ -51,7 +51,7 @@ void DiscordManager::ProcessMessageQueue()
 						webhook.webhook_url
 					);
 				}
-				message = "";
+				message.clear();
 			}
 		}
 		// final flush
@@ -197,11 +197,11 @@ const std::map<int, std::string>& EQ::constants::GetLanguageMap()

 std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
-		return EQ::constants::GetLanguageMap().find(language_id)->second;
+	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetLanguageMap().find(language_id)->second;
 }

 const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
@@ -220,11 +220,11 @@ const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()

 std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 {
-	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 }

 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -243,11 +243,11 @@ const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()

 std::string EQ::constants::GetFlyModeName(int8 flymode_id)
 {
-	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
+	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
 }

 const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
@@ -365,11 +365,11 @@ const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()

 std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
 {
-	if (EQ::constants::GetConsiderLevelMap().find(faction_consider_level) != EQ::constants::GetConsiderLevelMap().end()) {
-		return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
+	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
+		return std::string();;
 	}

-	return std::string();
+	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
 }

 const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
@@ -386,11 +386,11 @@ const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()

 std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
 {
-	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
+	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
 }

 const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
@@ -407,11 +407,11 @@ const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()

 std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
 {
-	if (EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
+	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
 }

 const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
@@ -429,11 +429,11 @@ const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()

 std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 {
-	if (EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
+	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
 }

 const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
@@ -507,11 +507,12 @@ const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()

 std::string EQ::constants::GetObjectTypeName(int object_type)
 {
-	if (EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return EQ::constants::GetObjectTypeMap().find(object_type)->second;
+	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
+		return std::string();
+
 	}

-	return std::string();
+	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
 }

 const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
@@ -527,11 +528,11 @@ const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()

 std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
 {
-	if (EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
+	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
@@ -553,11 +554,11 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()

 std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 {
-	if (EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
+	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
@@ -573,9 +574,9 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()

 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
-		return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
+	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+		return std::string();
 	}

-	return std::string();
+	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 }
@@ -129,7 +129,7 @@ namespace EQ

 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				InventoryTypeSize_Struct InventoryTypeSize,
+				const InventoryTypeSize_Struct& InventoryTypeSize,
 				uint64 EquipmentBitmask,
 				uint64 GeneralBitmask,
 				uint64 CursorBitmask,
@@ -236,26 +236,6 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }

-/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
-:	BasePacket(buf, len),
-	opcode(op)
-{
-
-uint32 offset;
-	opcode=ntohs(*(const uint16 *)buf);
-	offset=2;
-
-	if (len-offset) {
-		pBuffer= new unsigned char[len-offset];
-		memcpy(pBuffer,buf+offset,len-offset);
-		size=len-offset;
-	} else {
-		pBuffer=nullptr;
-		size=0;
-	}
-	OpMgr=&RawOpcodeManager;
-}*/
-
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
@@ -287,74 +267,6 @@ bool result=false;

 }

-/*
-this is the code to do app-layer combining, instead of protocol layer.
-this was taken out due to complex interactions with the opcode manager,
-and will require a bit more thinking (likely moving into EQStream) to
-get running again... but might be a good thing some day.
-
-bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
-{
-uint32 newsize=0, offset=0;
-unsigned char *tmpbuffer=nullptr;
-
-	if (opcode!=OP_AppCombined) {
-		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		offset=0;
-		if (size>254) {
-			tmpbuffer[offset++]=0xff;
-			*(uint16 *)(tmpbuffer+offset)=htons(size);
-			offset+=1;
-		} else {
-			tmpbuffer[offset++]=size;
-		}
-		offset+=serialize(tmpbuffer+offset);
-	} else {
-		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		memcpy(tmpbuffer,pBuffer,size);
-		offset=size;
-	}
-
-	if (rhs->size>254) {
-		tmpbuffer[offset++]=0xff;
-		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
-		offset+=1;
-	} else {
-		tmpbuffer[offset++]=rhs->size;
-	}
-	offset+=rhs->serialize(tmpbuffer+offset);
-
-	size=offset;
-	opcode=OP_AppCombined;
-
-	delete[] pBuffer;
-	pBuffer=tmpbuffer;
-
-	return true;
-}
-*/
-
-bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
-{
-bool valid=false;
-	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
-	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
-		valid=true;
-	} else {
-		uint16 comp_crc=CRC16(buffer,length-2,Key);
-		uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2));
-#ifdef EQN_DEBUG
-		if (packet_crc && comp_crc != packet_crc) {
-			std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl;
-		}
-#endif
-		valid = (!packet_crc || comp_crc == packet_crc);
-	}
-	return valid;
-}
-
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
 uint32 newlen=0;
@@ -403,55 +315,6 @@ uint32 flag_offset=1,newlength;
 	return newlength;
 }

-void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
-{
-	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
-		int Key=DecodeKey;
-		unsigned char *test=(unsigned char *)malloc(size);
-		buffer+=2;
-		size-=2;
-
-		int i;
-		for (i = 0 ; i+4 <= size ; i+=4)
-		{
-			int pt = (*(int*)&buffer[i])^(Key);
-			Key = (*(int*)&buffer[i]);
-			*(int*)&test[i]=pt;
-		}
-		unsigned char KC=Key&0xFF;
-		for ( ; i < size ; i++)
-		{
-			test[i]=buffer[i]^KC;
-		}
-		memcpy(buffer,test,size);
-		free(test);
-	}
-}
-
-void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
-{
-	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
-		int Key=EncodeKey;
-		char *test=(char*)malloc(size);
-		int i;
-		buffer+=2;
-		size-=2;
-		for ( i = 0 ; i+4 <= size ; i+=4)
-		{
-			int pt = (*(int*)&buffer[i])^(Key);
-			Key = pt;
-			*(int*)&test[i]=pt;
-		}
-		unsigned char KC=Key&0xFF;
-		for ( ; i < size ; i++)
-		{
-			test[i]=buffer[i]^KC;
-		}
-		memcpy(buffer,test,size);
-		free(test);
-	}
-}
-
 EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
@@ -515,4 +378,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}
@@ -80,11 +80,8 @@ public:

 protected:

-	static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key);
 	static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
 	static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
-	static void ChatDecode(unsigned char *buffer, int size, int DecodeKey);
-	static void ChatEncode(unsigned char *buffer, int size, int EncodeKey);

 	uint16 GetRawOpcode() const { return(opcode); }

@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }

-void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -145,7 +145,7 @@ void EQStreamIdentifier::Process() {
 }

 void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> eqs) {
-	m_streams.push_back(Record(eqs));
+	m_streams.emplace_back(Record(eqs));
 	eqs = nullptr;
 }

@@ -18,7 +18,7 @@ public:
 	~EQStreamIdentifier();

 	//registration interface.
-	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);

 	//main processing interface
 	void Process();
@@ -23,9 +23,6 @@

 EQDB EQDB::s_EQDB;

-EQDB::EQDB() {
-}
-
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }
@@ -27,7 +27,7 @@

 //this is the main object exported to perl.
 class EQDB {
-	EQDB();
+	EQDB() = default;
 public:
 	static EQDB *Singleton() { return(&s_EQDB); }

@@ -34,13 +34,13 @@ void EQEmuConfig::parse_config()
 	LongName     = _root["server"]["world"].get("longname", "").asString();
 	WorldAddress = _root["server"]["world"].get("address", "").asString();
 	LocalAddress = _root["server"]["world"].get("localaddress", "").asString();
-	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString().c_str());
+	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString());
 	SharedKey    = _root["server"]["world"].get("key", "").asString();
 	LoginCount   = 0;

 	if (_root["server"]["world"]["loginserver"].isObject()) {
 		LoginHost   = _root["server"]["world"]["loginserver"].get("host", "login.eqemulator.net").asString();
-		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString().c_str());
+		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString());
 		LoginLegacy = false;
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
@@ -63,7 +63,7 @@ void EQEmuConfig::parse_config()

 			auto loginconfig = new LoginConfig;
 			loginconfig->LoginHost     = _root["server"]["world"][str].get("host", "login.eqemulator.net").asString();
-			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString().c_str());
+			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString());
 			loginconfig->LoginAccount  = _root["server"]["world"][str].get("account", "").asString();
 			loginconfig->LoginPassword = _root["server"]["world"][str].get("password", "").asString();

@@ -86,15 +86,15 @@ void EQEmuConfig::parse_config()
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; }
 	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
-	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str());
+	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());

 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
-	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str());
+	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString());
 	TelnetEnabled = false;
 	if (_root["server"]["world"]["telnet"].get("enabled", "false").asString() == "true") { TelnetEnabled = true; }

 	WorldHTTPMimeFile = _root["server"]["world"]["http"].get("mimefile", "mime.types").asString();
-	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString().c_str());
+	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString());
 	WorldHTTPEnabled  = false;

 	if (_root["server"]["world"]["http"].get("enabled", "false").asString() == "true") {
@@ -109,9 +109,9 @@ void EQEmuConfig::parse_config()
 	 * UCS
 	 */
 	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
-	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
+	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
 	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
-	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString().c_str());
+	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());

 	/**
 	 * Database
@@ -119,7 +119,7 @@ void EQEmuConfig::parse_config()
 	DatabaseUsername = _root["server"]["database"].get("username", "eq").asString();
 	DatabasePassword = _root["server"]["database"].get("password", "eq").asString();
 	DatabaseHost     = _root["server"]["database"].get("host", "localhost").asString();
-	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString().c_str());
+	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString());
 	DatabaseDB       = _root["server"]["database"].get("db", "eq").asString();

 	/**
@@ -128,14 +128,14 @@ void EQEmuConfig::parse_config()
 	ContentDbUsername = _root["server"]["content_database"].get("username", "").asString();
 	ContentDbPassword = _root["server"]["content_database"].get("password", "").asString();
 	ContentDbHost     = _root["server"]["content_database"].get("host", "").asString();
-	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString().c_str());
+	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString());
 	ContentDbName     = _root["server"]["content_database"].get("db", "").asString();

 	/**
 	 * QS
 	 */
 	QSDatabaseHost     = _root["server"]["qsdatabase"].get("host", "localhost").asString();
-	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString().c_str());
+	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString());
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
@@ -143,9 +143,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());
+	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
+	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
+	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());

 	/**
 	 * Files
@@ -175,10 +175,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
+	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
+	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
+	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
+	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
@@ -147,12 +147,6 @@ class EQEmuConfig
 			return (_config);
 		}

-		// Allow the use to set the conf file to be used.
-		static void SetConfigFile(std::string file)
-		{
-			EQEmuConfig::ConfigFile = file;
-		}
-
 		// Load the config
 		static bool LoadConfig(const std::string& path = "")
 		{
@@ -187,9 +187,10 @@ void EQEmuLogSys::ProcessLogWrite(
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
+		case Logs::Crash:
+		case Logs::Error:
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
-		case Logs::Error:
 			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
@@ -199,8 +200,6 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 		case Logs::Commands:
 		case Logs::Mercenaries:
 			return Chat::Magenta;
-		case Logs::Crash:
-			return Chat::Red;
 		default:
 			return Chat::Yellow;
 	}
@@ -58,10 +58,6 @@ EQTime::EQTime()
 	SetCurrentEQTimeOfDay(start, time(0));
 }

-EQTime::~EQTime()
-{
-}
-
 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
 //This function was written by the ShowEQ Project.
 //Input: Current Time (as a time_t), a pointer to the TimeOfDay_Struct that will be written to.
@@ -203,4 +199,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 		t->month, t->day, t->year, t->hour, t->minute);
 	buf[127] = '\0';
 	str = buf;
-}
+}
@@ -18,7 +18,7 @@ public:
 	//Constructor/destructor
 	EQTime(TimeOfDay_Struct start_eq, time_t start_real);
 	EQTime();
-	~EQTime();
+	~EQTime() = default;

 	//Get functions
 	int GetCurrentEQTimeOfDay( TimeOfDay_Struct *eqTimeOfDay ) { return(GetCurrentEQTimeOfDay(time(nullptr), eqTimeOfDay)); }
@@ -38,7 +38,7 @@ namespace EQ
 				_running = true;

 				for (size_t i = 0; i < threads; ++i) {
-					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+					_threads.emplace_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
 				}
 			}
 			
@@ -333,7 +333,10 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
 			break;
 		}
-		case PlayerEvent::FISH_FAILURE: {
+		case PlayerEvent::FISH_FAILURE:
+		case PlayerEvent::FORAGE_FAILURE:
+		case PlayerEvent::WENT_ONLINE:
+		case PlayerEvent::WENT_OFFLINE: {
 			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
 			break;
 		}
@@ -348,10 +351,6 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
 			break;
 		}
-		case PlayerEvent::FORAGE_FAILURE: {
-			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
-			break;
-		}
 		case PlayerEvent::FORAGE_SUCCESS: {
 			PlayerEvent::ForageSuccessEvent n{};
 			std::stringstream               ss;
@@ -550,11 +549,6 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 			payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
 			break;
 		}
-		case PlayerEvent::WENT_ONLINE:
-		case PlayerEvent::WENT_OFFLINE: {
-			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
-			break;
-		}
 		case PlayerEvent::MERCHANT_PURCHASE: {
 			PlayerEvent::MerchantPurchaseEvent n{};
 			std::stringstream                  ss;
@@ -218,14 +218,14 @@ enum {	//some random constants
 #define HARD_LEVEL_CAP 127

 //the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
-#define USE_NPC_RANGE2 200*200		//arbitrary right now
+#define USE_NPC_RANGE2 40000		//arbitrary right now

 // Squared range for rampage 75.0 * 75.0 for now
 #define NPC_RAMPAGE_RANGE2 5625.0f

 //the formula for experience for killing a mob.
 //level is the only valid variable to use
-#define EXP_FORMULA level*level*75*35/10
+#define EXP_FORMULA (level * level * 75 * 35 / 10)

 #define HIGHEST_AA_VALUE 35

@@ -295,7 +295,7 @@ Developer configuration

 #define COMMON_PROFILE

-#define PROFILE_DUMP_TIME 3*60
+#define PROFILE_DUMP_TIME 180
 #endif	//EQPROFILE


@@ -37,6 +37,7 @@

 #include <fmt/format.h>
 #include <filesystem>
+#include <iostream>

 namespace fs = std::filesystem;

@@ -80,3 +81,26 @@ std::string File::GetCwd()
 {
 	return fs::current_path().string();
 }
+
+FileContentsResult File::GetContents(const std::string &file_name)
+{
+	std::string   error;
+	std::ifstream f;
+	f.open(file_name);
+	std::string line;
+	std::string lines;
+	if (f.is_open()) {
+		while (f) {
+			std::getline(f, line);
+			lines += line + "\n";
+		}
+	}
+	else {
+		error = fmt::format("Couldn't open file [{}]", file_name);
+	}
+
+	return FileContentsResult{
+		.contents = lines,
+		.error = error,
+	};
+}
@@ -25,10 +25,16 @@

 namespace fs = std::filesystem;

+struct FileContentsResult {
+	std::string contents;
+	std::string error;
+};
+
 class File {
 public:
 	static bool Exists(const std::string &name);
 	static void Makedir(const std::string& directory_name);
+	static FileContentsResult GetContents(const std::string &file_name);
 	static std::string FindEqemuConfigPath();
 	static std::string GetCwd();
 };
@@ -6690,7 +6690,7 @@ static WSInit wsinit_;
 		if (params.empty()) { return Get(path, headers); }

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query.c_str(), headers, progress);
+		return Get(path_with_query, headers, progress);
 	}

 	inline Result ClientImpl::Get(const std::string &path, const Params &params,
@@ -6710,7 +6710,7 @@ static WSInit wsinit_;
 		}

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query.c_str(), headers, response_handler,
+		return Get(path_with_query, headers, response_handler,
 				   content_receiver, progress);
 	}

@@ -6807,7 +6807,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body = detail::serialize_multipart_formdata(
 			items, detail::make_multipart_data_boundary(), content_type);
-		return Post(path, headers, body, content_type.c_str());
+		return Post(path, headers, body, content_type);
 	}

 	inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
@@ -6820,7 +6820,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body =
 						detail::serialize_multipart_formdata(items, boundary, content_type);
-		return Post(path, headers, body, content_type.c_str());
+		return Post(path, headers, body, content_type);
 	}

 	inline Result ClientImpl::Put(const std::string &path) {
@@ -412,11 +412,12 @@ bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 		// If there are no charges left on the item,
 		if (item_to_delete->GetCharges() <= 0) {
 			// If the item is stackable (e.g arrows), or
-			// the item is not stackable, and is not a charged item, or is expendable, delete it
-			if (item_to_delete->IsStackable() ||
-				(!item_to_delete->IsStackable() &&
-				 ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))
-				) {
+			// the item is not a charged item, or is expendable, delete it
+			if (
+				item_to_delete->IsStackable() ||
+				item_to_delete->GetItem()->MaxCharges == 0 ||
+				item_to_delete->IsExpendable()
+			) {
 				// Item can now be destroyed
 				InventoryProfile::MarkDirty(item_to_delete);
 				return true;
@@ -355,181 +355,186 @@ namespace EQ

 	struct ItemData {
 		// Non packet based fields
-		uint8	MinStatus;
+		uint8	MinStatus {};

 		// Packet based fields
-		uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
-		char	Name[64];		// Name
-		char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
-		char	IDFile[30];		// Visible model
-		uint32	ID;				// Unique ID (also PK for DB)
-		int32	Weight;			// Item weight * 10
-		uint8	NoRent;			// No Rent: 0=norent, 255=not norent
-		uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
-		uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
-		uint32	Slots;			// Bitfield for which slots this item can be used in
-		uint32	Price;			// Item cost (?)
-		uint32	Icon;			// Icon Number
-		int32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
-		bool	LoreFlag;		// This will be true if LoreGroup is non-zero
-		bool	PendingLoreFlag;
-		bool	ArtifactFlag;
-		bool	SummonedFlag;
-		uint8	FVNoDrop;		// Firiona Vie nodrop flag
-		uint32	Favor;			// Individual favor
-		uint32	GuildFavor;		// Guild favor
-		uint32	PointType;
+		uint8	ItemClass {};		// Item Type: 0=common, 1=container, 2=book
+		char	Name[64] {};		// Name
+		char	Lore[80] {};		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
+		char	IDFile[30] {};		// Visible model
+		uint32	ID {};				// Unique ID (also PK for DB)
+		int32	Weight {};			// Item weight * 10
+		uint8	NoRent{} ;			// No Rent: 0=norent, 255=not norent
+		uint8	NoDrop {};			// No Drop: 0=nodrop, 255=not nodrop
+		uint8	Size {};			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
+		uint32	Slots {};			// Bitfield for which slots this item can be used in
+		uint32	Price {};			// Item cost (?)
+		uint32	Icon {};			// Icon Number
+		int32	LoreGroup {};		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
+		bool	LoreFlag {};		// This will be true if LoreGroup is non-zero
+		bool	PendingLoreFlag {};
+		bool	ArtifactFlag {};
+		bool	SummonedFlag {};
+		uint8	FVNoDrop {};		// Firiona Vie nodrop flag
+		uint32	Favor {};			// Individual favor
+		uint32	GuildFavor {};		// Guild favor
+		uint32	PointType {};

 		//uint32	Unk117;
 		//uint32	Unk118;
 		//uint32	Unk121;
 		//uint32	Unk124;

-		uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
-		uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
-		uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
-		uint8	BagWR;			// 0->100
+		uint8	BagType {};		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
+		uint8	BagSlots {};		// Number of slots: can only be 2, 4, 6, 8, or 10
+		uint8	BagSize {};		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
+		uint8	BagWR {};			// 0->100

-		bool	BenefitFlag;
-		bool	Tradeskills;	// Is this a tradeskill item?
-		int8	CR;				// Save vs Cold
-		int8	DR;				// Save vs Disease
-		int8	PR;				// Save vs Poison
-		int8	MR;				// Save vs Magic
-		int8	FR;				// Save vs Fire
-		int8	AStr;			// Strength
-		int8	ASta;			// Stamina
-		int8	AAgi;			// Agility
-		int8	ADex;			// Dexterity
-		int8	ACha;			// Charisma
-		int8	AInt;			// Intelligence
-		int8	AWis;			// Wisdom
-		int32	HP;				// HP
-		int32	Mana;			// Mana
-		int32	AC;				// AC
-		uint32	Deity;			// Bitmask of Deities that can equip this item
+		bool	BenefitFlag {};
+		bool	Tradeskills {};	// Is this a tradeskill item?
+		int8	CR {};				// Save vs Cold
+		int8	DR {};				// Save vs Disease
+		int8	PR {};				// Save vs Poison
+		int8	MR {};				// Save vs Magic
+		int8	FR {};				// Save vs Fire
+		int8	AStr {};			// Strength
+		int8	ASta {};			// Stamina
+		int8	AAgi {};			// Agility
+		int8	ADex {};			// Dexterity
+		int8	ACha {};			// Charisma
+		int8	AInt {};			// Intelligence
+		int8	AWis {};			// Wisdom
+		int32	HP {};				// HP
+		int32	Mana {};			// Mana
+		int32	AC {};				// AC
+		uint32	Deity {};			// Bitmask of Deities that can equip this item
 		//uint32	Unk033
-		int32	SkillModValue;	// % Mod to skill specified in SkillModType
-		int32	SkillModMax;	// Max skill point modification
-		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
-		uint32	BaneDmgRace;	// Bane Damage Race
-		int32	BaneDmgAmt;		// Bane Damage Body Amount
-		uint32	BaneDmgBody;	// Bane Damage Body
-		bool	Magic;			// True=Magic Item, False=not
-		int32	CastTime_;
-		uint8	ReqLevel;		// Required Level to use item
-		uint32	BardType;		// Bard Skill Type
-		int32	BardValue;		// Bard Skill Amount
-		int8	Light;			// Light
-		uint8	Delay;			// Delay * 10
-		uint8	RecLevel;		// Recommended level to use item
-		uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
-		uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
-		uint8	ElemDmgAmt;		// Elemental Damage
-		uint8	Range;			// Range of item
-		uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
-		uint32	Color;			// RR GG BB 00 <-- as it appears in pc
-		uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
-		uint32	Races;			// Bitfield of races that can equip item (1 << race#)
-		//uint32	Unk054;
-		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
-		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
-		int32	SubType;		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
-		uint8	Material;		// Item material type
-		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
-		float	SellRate;		// Sell rate
-		//uint32	Unk059;
+		int32	SkillModValue {};	// % Mod to skill specified in SkillModType
+		int32	SkillModMax {};	// Max skill point modification
+		uint32	SkillModType {};	// Type of skill for SkillModValue to apply to
+		uint32	BaneDmgRace {};	// Bane Damage Race
+		int32	BaneDmgAmt {};		// Bane Damage Body Amount
+		uint32	BaneDmgBody {};	// Bane Damage Body
+		bool	Magic {};			// True=Magic Item, False=not
+		int32	CastTime_ {};
+		uint8	ReqLevel {};		// Required Level to use item
+		uint32	BardType {};		// Bard Skill Type
+		int32	BardValue {};		// Bard Skill Amount
+		int8	Light {};			// Light
+		uint8	Delay {};			// Delay * 10
+		uint8	RecLevel {};		// Recommended level to use item
+		uint8	RecSkill {};		// Recommended skill to use item (refers to primary skill of item)
+		uint8	ElemDmgType {};	// Elemental Damage Type (1=magic, 2=fire)
+		uint8	ElemDmgAmt {};		// Elemental Damage
+		uint8	Range {};			// Range of item
+		uint32	Damage {};			// Delay between item usage (in 0.1 sec increments)
+		uint32	Color {};			// RR GG BB 00 <-- as it appears in pc
+		uint32	Classes {};		// Bitfield of classes that can equip item (1 << class#)
+		uint32	Races {};			// Bitfield of races that can equip item (1 << race#)
+		//uint32	Unk054 {};
+		int16	MaxCharges {};		// Maximum charges items can hold: -1 if not a chargeable item
+		uint8	ItemType {};		// Item Type/Skill (itemClass* from above)
+		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
+		uint8	Material {};		// Item material type
+		uint32	HerosForgeModel {};// Hero's Forge Armor Model Type (2-13?)
+		float	SellRate {};		// Sell rate
+		//uint32	Unk059 {};
 		union {
 			uint32 Fulfilment;	// Food fulfilment (How long it lasts)
 			uint32 CastTime;		// Cast Time for clicky effects, in milliseconds
 		};
-		uint32 EliteMaterial;
-		int32	ProcRate;
-		int8	CombatEffects;	// PoP: Combat Effects +
-		int8	Shielding;		// PoP: Shielding %
-		int8	StunResist;		// PoP: Stun Resist %
-		int8	StrikeThrough;	// PoP: Strike Through %
-		int32	ExtraDmgSkill;
-		int32	ExtraDmgAmt;
-		int8	SpellShield;	// PoP: Spell Shield %
-		int8	Avoidance;		// PoP: Avoidance +
-		int8	Accuracy;		// PoP: Accuracy +
-		uint32	CharmFileID;
-		int32	FactionMod1;	// Faction Mod 1
-		int32	FactionMod2;	// Faction Mod 2
-		int32	FactionMod3;	// Faction Mod 3
-		int32	FactionMod4;	// Faction Mod 4
-		int32	FactionAmt1;	// Faction Amt 1
-		int32	FactionAmt2;	// Faction Amt 2
-		int32	FactionAmt3;	// Faction Amt 3
-		int32	FactionAmt4;	// Faction Amt 4
-		char	CharmFile[32];	// ?
-		uint32	AugType;
-		uint8	AugSlotType[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Type
-		uint8	AugSlotVisible[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Visible
-		uint8	AugSlotUnk2[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
-		uint32	LDoNTheme;
-		uint32	LDoNPrice;
-		uint32	LDoNSold;
-		uint32	BaneDmgRaceAmt;
-		uint32	AugRestrict;
-		int32	Endur;
-		int32	DotShielding;
-		int32	Attack;
-		int32	Regen;
-		int32	ManaRegen;
-		int32	EnduranceRegen;
-		int32	Haste;
-		int32	DamageShield;
-		uint32	RecastDelay;
-		int	RecastType;
-		uint32	AugDistiller;
-		bool	Attuneable;
-		bool	NoPet;
-		bool	PotionBelt;
-		bool	Stackable;
-		bool	NoTransfer;
-		bool	QuestItemFlag;
-		int16	StackSize;
-		uint8	PotionBeltSlots;
-		item::ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;
+		uint32 EliteMaterial {};
+		int32	ProcRate {};
+		int8	CombatEffects {};	// PoP: Combat Effects +
+		int8	Shielding {};		// PoP: Shielding %
+		int8	StunResist {};		// PoP: Stun Resist %
+		int8	StrikeThrough {};	// PoP: Strike Through %
+		int32	ExtraDmgSkill {};
+		int32	ExtraDmgAmt {};
+		int8	SpellShield {};	// PoP: Spell Shield %
+		int8	Avoidance {};		// PoP: Avoidance +
+		int8	Accuracy {};		// PoP: Accuracy +
+		uint32	CharmFileID {};
+		int32	FactionMod1 {};	// Faction Mod 1
+		int32	FactionMod2 {};	// Faction Mod 2
+		int32	FactionMod3 {};	// Faction Mod 3
+		int32	FactionMod4 {};	// Faction Mod 4
+		int32	FactionAmt1 {};	// Faction Amt 1
+		int32	FactionAmt2 {};	// Faction Amt 2
+		int32	FactionAmt3 {};	// Faction Amt 3
+		int32	FactionAmt4 {};	// Faction Amt 4
+		char	CharmFile[32] {};	// ?
+		uint32	AugType {};
+		uint8	AugSlotType[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Type
+		uint8	AugSlotVisible[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Visible
+		uint8	AugSlotUnk2[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
+		uint32	LDoNTheme {};
+		uint32	LDoNPrice {};
+		uint32	LDoNSold {};
+		uint32	BaneDmgRaceAmt {};
+		uint32	AugRestrict {};
+		int32	Endur {};
+		int32	DotShielding {};
+		int32	Attack {};
+		int32	Regen {};
+		int32	ManaRegen {};
+		int32	EnduranceRegen {};
+		int32	Haste {};
+		int32	DamageShield {};
+		uint32	RecastDelay {};
+		int	RecastType {};
+		uint32	AugDistiller {};
+		bool	Attuneable {};
+		bool	NoPet {};
+		bool	PotionBelt {};
+		bool	Stackable {};
+		bool	NoTransfer {};
+		bool	QuestItemFlag {};
+		int16	StackSize {};
+		uint8	PotionBeltSlots {};
+		item::ItemEffect_Struct Click {};
+		item::ItemEffect_Struct Proc {};
+		item::ItemEffect_Struct Worn {};
+		item::ItemEffect_Struct Focus {};
+		item::ItemEffect_Struct Scroll {};
+		item::ItemEffect_Struct Bard {};

-		uint8	Book;			// 0=Not book, 1=Book
-		uint32	BookType;
-		char	Filename[33];	// Filename for book data
+		uint8	Book {};			// 0=Not book, 1=Book
+		uint32	BookType {};
+		char	Filename[33] {};	// Filename for book data
 		// Begin SoF Fields
-		int32 SVCorruption;
-		uint32 Purity;
-		uint8 EvolvingItem;
-		uint32 EvolvingID;
-		uint8 EvolvingLevel;
-		uint8 EvolvingMax;
-		uint32 BackstabDmg;
-		uint32 DSMitigation;
-		int32 HeroicStr;
-		int32 HeroicInt;
-		int32 HeroicWis;
-		int32 HeroicAgi;
-		int32 HeroicDex;
-		int32 HeroicSta;
-		int32 HeroicCha;
-		int32 HeroicMR;
-		int32 HeroicFR;
-		int32 HeroicCR;
-		int32 HeroicDR;
-		int32 HeroicPR;
-		int32 HeroicSVCorrup;
-		int32 HealAmt;
-		int32 SpellDmg;
-		uint32 LDoNSellBackRate;
-		uint32 ScriptFileID;
-		uint16 ExpendableArrow;
-		uint32 Clairvoyance;
-		char	ClickName[65];
-		char	ProcName[65];
-		char	WornName[65];
-		char	FocusName[65];
-		char	ScrollName[65];
+		int32 SVCorruption {};
+		uint32 Purity {};
+		uint8 EvolvingItem {};
+		uint32 EvolvingID {};
+		uint8 EvolvingLevel {};
+		uint8 EvolvingMax {};
+		uint32 BackstabDmg {};
+		uint32 DSMitigation {};
+		int32 HeroicStr {};
+		int32 HeroicInt {};
+		int32 HeroicWis {};
+		int32 HeroicAgi {};
+		int32 HeroicDex {};
+		int32 HeroicSta {};
+		int32 HeroicCha {};
+		int32 HeroicMR {};
+		int32 HeroicFR {};
+		int32 HeroicCR {};
+		int32 HeroicDR {};
+		int32 HeroicPR {};
+		int32 HeroicSVCorrup {};
+		int32 HealAmt {};
+		int32 SpellDmg {};
+		uint32 LDoNSellBackRate {};
+		uint32 ScriptFileID {};
+		uint16 ExpendableArrow {};
+		uint32 Clairvoyance {};
+		char	ClickName[65] {};
+		char	ProcName[65] {};
+		char	WornName[65] {};
+		char	FocusName[65] {};
+		char	ScrollName[65] {};
 		//BardName

 		bool IsEquipable(uint16 Race, uint16 Class) const;
@@ -17,6 +17,7 @@
 */

 #include "inventory_profile.h"
+#include "../common/data_verification.h"
 //#include "classes.h"
 //#include "global_define.h"
 //#include "item_instance.h"
@@ -57,108 +58,62 @@ static inline int32 GetNextItemInstSerialNumber() {
 // class EQ::ItemInstance
 //
 EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
-	m_use_type = ItemInstNormal;
-	if(item) {
-		m_item = new ItemData(*item);
-	} else {
-		m_item = nullptr;
-	}
-	m_charges = charges;
-	m_price = 0;
-	m_attuned = false;
-	m_merchantslot = 0;
-	if (m_item && m_item->IsClassCommon())
-		m_color = m_item->Color;
-	else
-		m_color = 0;
-	m_merchantcount = 1;
-	m_SerialNumber = GetNextItemInstSerialNumber();

-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	if (item) {
+		m_item = new ItemData(*item);
+	}
+
+	m_charges = charges;
+
+	if (m_item && m_item->IsClassCommon()) {
+		m_color = m_item->Color;
+	}
+
+	m_SerialNumber  = GetNextItemInstSerialNumber();
 }

 EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
-	m_use_type = ItemInstNormal;
-	m_item = db->GetItem(item_id);
-	if(m_item) {
+
+	m_item     = db->GetItem(item_id);
+
+	if (m_item) {
 		m_item = new ItemData(*m_item);
 	}
-	else {
-		m_item = nullptr;
-	}

 	m_charges = charges;
-	m_price = 0;
-	m_merchantslot = 0;
-	m_attuned=false;
-	if (m_item && m_item->IsClassCommon())
-		m_color = m_item->Color;
-	else
-		m_color = 0;
-	m_merchantcount = 1;
-	m_SerialNumber = GetNextItemInstSerialNumber();

-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	if (m_item && m_item->IsClassCommon()) {
+		m_color = m_item->Color;
+	} else {
+		m_color = 0;
+	}
+
+	m_SerialNumber  = GetNextItemInstSerialNumber();
 }

 EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) {
-	m_use_type = use_type;
-	m_item = nullptr;
-	m_charges = 0;
-	m_price = 0;
-	m_attuned = false;
-	m_merchantslot = 0;
-	m_color = 0;
-
-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	m_use_type     = use_type;
 }

 // Make a copy of an EQ::ItemInstance object
 EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 {
-	m_use_type=copy.m_use_type;
-	if(copy.m_item)
-		m_item = new ItemData(*copy.m_item);
-	else
-		m_item = nullptr;
+	m_use_type = copy.m_use_type;
+
+	if (copy.m_item) {
+		m_item = new ItemData(*copy.m_item);
+	} else {
+		m_item = nullptr;
+	}
+
+	m_charges       = copy.m_charges;
+	m_price         = copy.m_price;
+	m_color         = copy.m_color;
+	m_merchantslot  = copy.m_merchantslot;
+	m_currentslot   = copy.m_currentslot;
+	m_attuned       = copy.m_attuned;
+	m_merchantcount = copy.m_merchantcount;

-	m_charges=copy.m_charges;
-	m_price=copy.m_price;
-	m_color=copy.m_color;
-	m_merchantslot=copy.m_merchantslot;
-	m_currentslot=copy.m_currentslot;
-	m_attuned=copy.m_attuned;
-	m_merchantcount=copy.m_merchantcount;
 	// Copy container contents
 	for (auto it = copy.m_contents.begin(); it != copy.m_contents.end(); ++it) {
 		ItemInstance* inst_old = it->second;
@@ -168,37 +123,42 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 			inst_new = inst_old->Clone();
 		}

-		if (inst_new != nullptr) {
+		if (inst_new) {
 			m_contents[it->first] = inst_new;
 		}
 	}
+
 	std::map<std::string, std::string>::const_iterator iter;
 	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); ++iter) {
 		m_custom_data[iter->first] = iter->second;
 	}
-	m_SerialNumber = copy.m_SerialNumber;
-	m_custom_data = copy.m_custom_data;
-	m_timers = copy.m_timers;

-	m_exp = copy.m_exp;
+	m_SerialNumber = copy.m_SerialNumber;
+	m_custom_data  = copy.m_custom_data;
+	m_timers       = copy.m_timers;
+
+	m_exp       = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
 	m_activated = copy.m_activated;
-	if (copy.m_scaledItem)
+
+	if (copy.m_scaledItem) {
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
-	else
+	} else {
 		m_scaledItem = nullptr;
+	}

-	if(copy.m_evolveInfo)
+	if (copy.m_evolveInfo) {
 		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
-	else
+	} else {
 		m_evolveInfo = nullptr;
+	}

-	m_scaling = copy.m_scaling;
-	m_ornamenticon = copy.m_ornamenticon;
-	m_ornamentidfile = copy.m_ornamentidfile;
+	m_scaling             = copy.m_scaling;
+	m_ornamenticon        = copy.m_ornamenticon;
+	m_ornamentidfile      = copy.m_ornamentidfile;
 	m_ornament_hero_model = copy.m_ornament_hero_model;
-	m_recast_timestamp = copy.m_recast_timestamp;
-	m_new_id_file = copy.m_new_id_file;
+	m_recast_timestamp    = copy.m_recast_timestamp;
+	m_new_id_file         = copy.m_new_id_file;
 }

 // Clean up container contents
@@ -216,11 +176,13 @@ bool EQ::ItemInstance::IsType(item::ItemClass item_class) const
 	// IsType(<ItemClassTypes>) does not protect against 'm_item = nullptr'

 	// Check usage type
-	if ((m_use_type == ItemInstWorldContainer) && (item_class == item::ItemClassBag))
+	if (m_use_type == ItemInstWorldContainer && item_class == item::ItemClassBag) {
 		return true;
+	}

-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}

 	return (m_item->ItemClass == item_class);
 }
@@ -243,21 +205,20 @@ bool EQ::ItemInstance::IsClassBook() const
 // Is item stackable?
 bool EQ::ItemInstance::IsStackable() const
 {
-	if (!m_item)
-		return false;
-
-	return m_item->Stackable;
+	return (m_item && m_item->Stackable);
 }

 bool EQ::ItemInstance::IsCharged() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}

-	if (m_item->MaxCharges > 1)
+	if (m_item->MaxCharges > 1) {
 		return true;
-	else
+	} else {
 		return false;
+	}
 }

 // Can item be equipped?
@@ -306,26 +267,30 @@ bool EQ::ItemInstance::IsEquipable(int16 slot_id) const

 bool EQ::ItemInstance::IsAugmentable() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}

 	for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
-		if (m_item->AugSlotType[index] != 0)
+		if (m_item->AugSlotType[index] != 0) {
 			return true;
+		}
 	}

 	return false;
 }

 bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
-	if (!m_item || !m_item->IsClassCommon())
+	if (!m_item || !m_item->IsClassCommon()) {
 		return false;
+	}

 	int index = invslot::EQUIPMENT_BEGIN;
 	for (; index <= invslot::EQUIPMENT_END; ++index) {
 		if (m_item->Slots & (1 << index)) {
-			if (aug_wear_slots & (1 << index))
+			if (aug_wear_slots & (1 << index)) {
 				break;
+			}
 		}
 	}

@@ -394,9 +359,10 @@ EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const

 uint32 EQ::ItemInstance::GetItemID(uint8 slot) const
 {
-	ItemInstance *item = GetItem(slot);
-	if (item)
+	const auto item = GetItem(slot);
+	if (item) {
 		return item->GetID();
+	}

 	return 0;
 }
@@ -520,14 +486,21 @@ uint8 EQ::ItemInstance::FirstOpenSlot() const

 uint8 EQ::ItemInstance::GetTotalItemCount() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return 0;
+	}

 	uint8 item_count = 1;

-	if (m_item && !m_item->IsClassBag()) { return item_count; }
+	if (!m_item->IsClassBag()) {
+		return item_count;
+	}

-	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) { if (GetItem(index)) { ++item_count; } }
+	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) {
+		if (GetItem(index)) {
+			++item_count;
+		}
+	}

 	return item_count;
 }
@@ -555,78 +528,99 @@ EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 augment_index) const
 	return nullptr;
 }

-EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
+bool EQ::ItemInstance::IsOrnamentationAugment(EQ::ItemInstance* augment) const
 {
-	if (!m_item || !m_item->IsClassCommon()) { return nullptr; }
-	if (ornamentationAugtype == 0) { return nullptr; }
+	if (!m_item || !m_item->IsClassCommon() || !augment) {
+		return false;
+	}

-	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++)
-	{
-		if (GetAugment(i) && m_item->AugSlotType[i] == ornamentationAugtype)
-		{
-			const char *item_IDFile = GetAugment(i)->GetItem()->IDFile;
-			if (
-				(strncmp(item_IDFile, "IT64", strlen(item_IDFile)) == 0
-				|| strncmp(item_IDFile, "IT63", strlen(item_IDFile)) == 0)
-				&& GetAugment(i)->GetItem()->HerosForgeModel == 0
-				)
-			{
-				continue;
-			}
-			return GetAugment(i);
+	const auto augment_item = augment->GetItem();
+	if (!augment_item) {
+		return false;
+	}
+
+	const std::string& idfile = augment_item->IDFile;
+
+	if (
+		EQ::ValueWithin(
+			augment->GetAugmentType(),
+			OrnamentationAugmentTypes::StandardOrnamentation,
+			OrnamentationAugmentTypes::SpecialOrnamentation
+		) ||
+		(
+			idfile != "IT63" &&
+			idfile != "IT64"
+		) ||
+		augment_item->HerosForgeModel
+	) {
+		return true;
+	}
+
+	return false;
+}
+
+EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
+{
+	if (!m_item || !m_item->IsClassCommon()) {
+		return nullptr;
+	}
+
+	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++) {
+		const auto augment = GetAugment(i);
+		if (augment && IsOrnamentationAugment(augment)) {
+			return augment;
 		}
 	}

 	return nullptr;
 }

-uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
+uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
+{
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0 || material_slot < 0)
+	if (m_ornament_hero_model == 0 || material_slot < 0) {
 		return 0;
+	}

 	// Item is using an explicit Hero Forge ID
-	if (m_ornament_hero_model >= 1000)
+	if (m_ornament_hero_model >= 1000) {
 		return m_ornament_hero_model;
+	}

 	// Item is using a shorthand ID
 	return (m_ornament_hero_model * 100) + material_slot;
 }

-bool EQ::ItemInstance::UpdateOrnamentationInfo() {
-	if (!m_item || !m_item->IsClassCommon())
+bool EQ::ItemInstance::UpdateOrnamentationInfo()
+{
+	if (!m_item || !m_item->IsClassCommon()) {
 		return false;
+	}

-	bool ornamentSet = false;
+	const auto augment = GetOrnamentationAugment();

-	int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-	if (GetOrnamentationAug(ornamentationAugtype))
-	{
-		const ItemData* ornamentItem;
-		ornamentItem = GetOrnamentationAug(ornamentationAugtype)->GetItem();
-		if (ornamentItem != nullptr)
-		{
-			SetOrnamentIcon(ornamentItem->Icon);
-			SetOrnamentHeroModel(ornamentItem->HerosForgeModel);
-			if (strlen(ornamentItem->IDFile) > 2)
-			{
-				SetOrnamentationIDFile(Strings::ToUnsignedInt(&ornamentItem->IDFile[2]));
-			}
-			else
-			{
+	if (augment) {
+		const auto augment_item = GetOrnamentationAugment()->GetItem();
+
+		if (augment_item) {
+			SetOrnamentIcon(augment_item->Icon);
+			SetOrnamentHeroModel(augment_item->HerosForgeModel);
+
+			if (strlen(augment_item->IDFile) > 2) {
+				SetOrnamentationIDFile(Strings::ToUnsignedInt(&augment_item->IDFile[2]));
+			} else {
 				SetOrnamentationIDFile(0);
 			}
-			ornamentSet = true;
+
+			return true;
 		}
 	}
-	else
-	{
-		SetOrnamentIcon(0);
-		SetOrnamentHeroModel(0);
-		SetOrnamentationIDFile(0);
-	}

-	return ornamentSet;
+	SetOrnamentIcon(0);
+	SetOrnamentHeroModel(0);
+	SetOrnamentationIDFile(0);
+
+	return false;
 }

 bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
@@ -940,8 +934,9 @@ bool EQ::ItemInstance::IsDroppable(bool recurse) const

 void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	// if there's no actual item, don't do anything
-	if (!m_item)
+	if (!m_item) {
 		return;
+	}

 	// initialize scaling items
 	if (m_item->CharmFileID != 0) {
@@ -950,7 +945,7 @@ void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	}

 	// initialize evolving items
-	else if ((db) && m_item->LoreGroup >= 1000 && m_item->LoreGroup != -1) {
+	else if (db && m_item->LoreGroup >= 1000) {
 		// not complete yet
 	}
 }
@@ -51,6 +51,11 @@ typedef enum {
 	byFlagNotSet	//apply action if the flag is NOT set
 } byFlagSetting;

+enum OrnamentationAugmentTypes {
+	StandardOrnamentation = 20,
+	SpecialOrnamentation = 21
+};
+
 class SharedDatabase;

 // ########################################
@@ -136,7 +141,8 @@ namespace EQ
 		bool IsAugmented();
 		bool ContainsAugmentByID(uint32 item_id);
 		int CountAugmentByID(uint32 item_id);
-		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
+		bool IsOrnamentationAugment(EQ::ItemInstance* augment) const;
+		ItemInstance* GetOrnamentationAugment() const;
 		bool UpdateOrnamentationInfo();
 		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);

@@ -304,34 +310,33 @@ namespace EQ

 		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }

-		ItemInstTypes		m_use_type;	// Usage type for item
-		const ItemData*		m_item;		// Ptr to item data
-		int16				m_charges;	// # of charges for chargeable items
-		uint32				m_price;	// Bazaar /trader price
-		uint32				m_color;
-		uint32				m_merchantslot;
-		int16				m_currentslot;
-		bool				m_attuned;
-		int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
-		int32				m_SerialNumber;	// Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32				m_exp;
-		int8				m_evolveLvl;
-		bool				m_activated;
-		ItemData*			m_scaledItem;
-		::EvolveInfo*		m_evolveInfo;
-		bool				m_scaling;
-		uint32				m_ornamenticon;
-		uint32				m_ornamentidfile;
-		uint32				m_new_id_file;
-		uint32				m_ornament_hero_model;
-		uint32				m_recast_timestamp;
-		int                 m_task_delivered_count = 0;
+		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
+		const ItemData*		m_item {nullptr};		// Ptr to item data
+		int16				m_charges {0};	// # of charges for chargeable items
+		uint32				m_price {0};	// Bazaar /trader price
+		uint32				m_color {0};
+		uint32				m_merchantslot {0};
+		int16				m_currentslot {0};
+		bool				m_attuned {false};
+		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
+		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp {0};
+		int8				m_evolveLvl {0};
+		bool				m_activated {false};
+		ItemData*			m_scaledItem {nullptr};
+		::EvolveInfo*		m_evolveInfo {nullptr};
+		bool				m_scaling {false};
+		uint32				m_ornamenticon {0};
+		uint32				m_ornamentidfile {0};
+		uint32				m_new_id_file {0};
+		uint32				m_ornament_hero_model {0};
+		uint32				m_recast_timestamp {0};
+		int                 m_task_delivered_count {0};

-		//
-		// Items inside of this item (augs or contents);
-		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
-		std::map<std::string, std::string>	m_custom_data;
-		std::map<std::string, ::Timer>		m_timers;
+		// Items inside of this item (augs or contents) {};
+		std::map<uint8, ItemInstance*>		m_contents {}; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data {};
+		std::map<std::string, ::Timer>		m_timers {};
 	};
 }

@@ -151,7 +151,7 @@ static char *temp=nullptr;
 		return false;
 	}
 	ptr++;
-	uint32 id = Strings::ToUnsignedInt(field[id_pos].c_str());
+	uint32 id = Strings::ToUnsignedInt(field[id_pos]);
 	items[id]=field;

 	for(i=0;i<10;i++) {
@@ -7,7 +7,7 @@ EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(addr, port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		ConsoleServerConnection *c = new ConsoleServerConnection(this, connection);
-		m_connections.insert(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
+		m_connections.emplace(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
 	});
 }

@@ -97,7 +97,7 @@ void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int po
 		m_on_new_connection(connection);
 	}

-	m_connections.insert(std::make_pair(std::make_pair(addr, port), connection));
+	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
 }

 void EQ::Net::DaybreakConnectionManager::Process()
@@ -234,7 +234,7 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi
 				if (m_on_new_connection) {
 					m_on_new_connection(connection);
 				}
-				m_connections.insert(std::make_pair(std::make_pair(endpoint, port), connection));
+				m_connections.emplace(std::make_pair(std::make_pair(endpoint, port), connection));
 				connection->ProcessPacket(p);
 			}
 			else if (data[1] != OP_OutOfSession) {
@@ -527,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
 		DynamicPacket *out = new DynamicPacket();
 		out->PutPacket(0, p);

-		s->packet_queue.insert(std::make_pair(seq, out));
+		s->packet_queue.emplace(std::make_pair(seq, out));
 	}
 }

@@ -1427,7 +1427,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(first_packet);
@@ -1459,7 +1459,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
-			stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+			stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 			stream->sequence_out++;

 			InternalBufferedSend(packet);
@@ -1483,7 +1483,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(packet);
@@ -22,7 +22,7 @@ void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions
 void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
-	m_streams.insert(std::make_pair(connection, stream));
+	m_streams.emplace(std::make_pair(connection, stream));
 	if (m_on_new_connection) {
 		m_on_new_connection(stream);
 	}
@@ -45,7 +45,7 @@ void EQ::Net::ServertalkClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -41,7 +41,7 @@ void EQ::Net::ServertalkLegacyClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkLegacyClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkLegacyClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -19,12 +19,12 @@ void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)

 void EQ::Net::ServertalkServer::OnConnectionIdentified(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_ident.insert(std::make_pair(type, cb));
+	m_on_ident.emplace(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::OnConnectionRemoved(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_disc.insert(std::make_pair(type, cb));
+	m_on_disc.emplace(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::ConnectionDisconnected(ServertalkServerConnection *conn)
@@ -75,7 +75,7 @@ void EQ::Net::ServertalkServer::ConnectionIdentified(ServertalkServerConnection
 			else {
 				std::vector<std::shared_ptr<EQ::Net::ServertalkServerConnection>> vec;
 				vec.push_back(*iter);
-				m_ident_connections.insert(std::make_pair(conn->GetIdentifier(), vec));
+				m_ident_connections.emplace(std::make_pair(conn->GetIdentifier(), vec));
 			}

 			m_unident_connections.erase(iter);
@@ -100,7 +100,7 @@ void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkServerConnection::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -142,7 +142,7 @@ void EQ::Net::TCPConnection::Write(const char *data, size_t count)

 	WriteBaton *baton = new WriteBaton;
 	baton->connection = this;
-	baton->buffer = new char[count];;
+	baton->buffer = new char[count];

 	uv_write_t *write_req = new uv_write_t;
 	memset(write_req, 0, sizeof(uv_write_t));
@@ -5218,7 +5218,6 @@ namespace RoF
 		/**
 		 * Ornamentation
 		 */
-		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;

@@ -5477,7 +5477,6 @@ namespace RoF2
 		/**
 		 * Ornamentation
 		 */
-		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;

@@ -3851,17 +3851,17 @@ namespace UF
 			ob.write((const char*)&evotop, sizeof(UF::structs::EvolvingItem));
 		}

-		//ORNAMENT IDFILE / ICON -
-		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-		uint16 ornaIcon = 0;
-		if (inst->GetOrnamentationAug(ornamentationAugtype)) {
-			const EQ::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
-			ornaIcon = aug_weap->Icon;
+		uint16     ornament_icon = 0;
+		const auto augment       = inst->GetOrnamentationAugment();

-			ob.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
+		if (augment) {
+			const auto augment_item = augment->GetItem();
+			ornament_icon = augment_item->Icon;
+
+			ob.write(augment_item->IDFile, strlen(augment_item->IDFile));
 		}
 		else if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon()) {
-			ornaIcon = inst->GetOrnamentationIcon();
+			ornament_icon = inst->GetOrnamentationIcon();
 			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());

 			ob.write(tmp, strlen(tmp));
@@ -3870,7 +3870,7 @@ namespace UF

 		UF::structs::ItemSerializationHeaderFinish hdrf;

-		hdrf.ornamentIcon = ornaIcon;
+		hdrf.ornamentIcon = ornament_icon;
 		hdrf.unknown060 = 0; //This is Always 0.. or it breaks shit..
 		hdrf.unknown061 = 0; //possibly ornament / special ornament
 		hdrf.isCopied = 0; //Flag for item to be 'Copied'
@@ -64,7 +64,7 @@ void ProcLauncher::Process() {
 		if(GetExitCodeProcess(cur->second->proc_info.hProcess, &res)) {
 			//got exit code, see if its still running...
 			if(res == STILL_ACTIVE) {
-				cur++;
+				++cur;
 				continue;
 			}
 			//else, it died, handle properly
@@ -76,7 +76,7 @@ void ProcLauncher::Process() {

 		//if we get here, the current process died.
 		tmp = cur;
-		tmp++;
+		++tmp;
 		ProcessTerminated(cur);
 		cur = tmp;
 	}
@@ -174,7 +174,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	std::vector<std::string>::iterator cur, end;
 	cur = it->args.begin();
 	end = it->args.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		args += " ";
 		args += *cur;
 	}
@@ -306,7 +306,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = m_running.begin();
 		end = m_running.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			Terminate(cur->first, true);
 		}
 	} else {
@@ -317,7 +317,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = running.begin();
 		end = running.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			Terminate(cur->first, true);
 			safe_delete(cur->second);
 		}
@@ -4,7 +4,8 @@

 std::string Process::execute(const std::string &cmd)
 {
-	std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
+	std::string           command = fmt::format("{} 2>&1", cmd);
+	std::shared_ptr<FILE> pipe(popen(command.c_str(), "r"), pclose);
 	if (!pipe) { return "ERROR"; }
 	char        buffer[128];
 	std::string result;
@@ -258,7 +258,7 @@ bool EQ::ProfanityManager::clear_database_entries(DBcore *db) {
 	return true;
 }

-bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) {
+bool EQ::ProfanityManager::check_for_existing_entry(const std::string& profanity) {
 	if (profanity.empty()) {
 		return false;
 	}
@@ -53,7 +53,7 @@ namespace EQ
 	private:
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
-		static bool check_for_existing_entry(std::string profanity);
+		static bool check_for_existing_entry(const std::string& profanity);
 		
 	};

@@ -141,11 +141,11 @@ bool RuleManager::SetRule(const std::string &rule_name, const std::string &rule_

 	switch (type) {
 		case IntRule:
-			m_RuleIntValues[index] = Strings::ToInt(rule_value.c_str());
+			m_RuleIntValues[index] = Strings::ToInt(rule_value);
 			LogRules("Set rule [{}] to value [{}]", rule_name, m_RuleIntValues[index]);
 			break;
 		case RealRule:
-			m_RuleRealValues[index] = Strings::ToFloat(rule_value.c_str());
+			m_RuleRealValues[index] = Strings::ToFloat(rule_value);
 			LogRules("Set rule [{}] to value [{:.2f}]", rule_name, m_RuleRealValues[index]);
 			break;
 		case BoolRule:
@@ -369,7 +369,7 @@ void RuleManager::_SaveRule(Database *db, RuleType type, uint16 index) {
 			break;
 	}

-	const auto rule_notes = _GetRuleNotes(type, index);
+	const auto& rule_notes = _GetRuleNotes(type, index);

 	const auto& l = RuleValuesRepository::GetWhere(
 		*db,
@@ -136,7 +136,6 @@ RULE_BOOL(Character, EnableFoodRequirement, true, "If disabled, food is no longe
 RULE_INT(Character, BaseInstrumentSoftCap, 36, "Softcap for instrument mods, 36 commonly referred to as 3.6 as well")
 RULE_BOOL(Character, UseSpellFileSongCap, true, "When they removed the AA that increased the cap they removed the above and just use the spell field")
 RULE_INT(Character, BaseRunSpeedCap, 158, "Base Run Speed Cap, on live it's 158% which will give you a runspeed of 1.580 hard capped to 225")
-RULE_INT(Character, OrnamentationAugmentType, 20, "Ornamentation Augment Type")
 RULE_REAL(Character, EnvironmentDamageMulipliter, 1, "Multiplier for environmental damage like fall damage.")
 RULE_BOOL(Character, UnmemSpellsOnDeath, true, "Setting whether at death all memorized Spells are forgotten")
 RULE_REAL(Character, TradeskillUpAlchemy, 2.0, "Alchemy skillup rate adjustment. Lower is faster")
@@ -518,6 +517,7 @@ RULE_BOOL(Combat, HeadshotOnlyHumanoids, true, "Enable or disable Headshot only
 RULE_BOOL(Combat, EnableWarriorShielding, true, "Enable or disable Warrior Shielding Ability (/shield), true by default.")
 RULE_BOOL(Combat, BackstabIgnoresElemental, false, "Enable or disable Elemental weapon damage affecting backstab damage, false by default.")
 RULE_BOOL(Combat, BackstabIgnoresBane, false, "Enable or disable Bane weapon damage affecting backstab damage, false by default.")
+RULE_BOOL(Combat, SummonMeleeRange, true, "Enable or disable summoning of a player when already in melee range of the summoner.")
 RULE_CATEGORY_END()

 RULE_CATEGORY(NPC)
@@ -294,7 +294,7 @@ void EQ::SayLinkEngine::generate_text()
 	m_LinkText = "null";
 }

-std::string EQ::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name)
+std::string EQ::SayLinkEngine::GenerateQuestSaylink(const std::string& saylink_text, bool silent, const std::string& link_name)
 {
 	uint32 saylink_id = 0;

@@ -403,16 +403,14 @@ SaylinkRepository::Saylink EQ::SayLinkEngine::GetOrSaveSaylink(std::string sayli
 	}

 	// if not found in database - save
-	if (saylinks.empty()) {
-		auto new_saylink = SaylinkRepository::NewEntity();
-		new_saylink.phrase = saylink_text;
+	auto new_saylink = SaylinkRepository::NewEntity();
+	new_saylink.phrase = saylink_text;

-		// persist to database
-		auto link = SaylinkRepository::InsertOne(database, new_saylink);
-		if (link.id > 0) {
-			g_cached_saylinks.emplace_back(link);
-			return link;
-		}
+	// persist to database
+	auto link = SaylinkRepository::InsertOne(database, new_saylink);
+	if (link.id > 0) {
+		g_cached_saylinks.emplace_back(link);
+		return link;
 	}

 	return {};
@@ -101,7 +101,7 @@ namespace EQ
 		const std::string& LinkBody() { return m_LinkBody; }	// contains string format: '<LinkBody>'
 		const std::string& LinkText() { return m_LinkText; }	// contains string format: '<LinkText>'

-		static std::string GenerateQuestSaylink(std::string saylink_text, bool silent, std::string link_name);
+		static std::string GenerateQuestSaylink(const std::string& saylink_text, bool silent, const std::string& link_name);

 		void Reset();

@@ -47,9 +47,9 @@ const SharedTasksRepository::SharedTasks &SharedTask::GetDbSharedTask() const
 	return m_db_shared_task;
 }

-void SharedTask::SetDbSharedTask(const SharedTasksRepository::SharedTasks &m_db_shared_task)
+void SharedTask::SetDbSharedTask(const SharedTasksRepository::SharedTasks &t)
 {
-	SharedTask::m_db_shared_task = m_db_shared_task;
+	SharedTask::m_db_shared_task = t;
 }

 SharedTaskRequest SharedTask::GetRequestCharacters(Database &db, uint32_t requested_character_id)
@@ -216,7 +216,7 @@ public:

 	// active record of database shared task
 	const SharedTasksRepository::SharedTasks &GetDbSharedTask() const;
-	void SetDbSharedTask(const SharedTasksRepository::SharedTasks &m_db_shared_task);
+	void SetDbSharedTask(const SharedTasksRepository::SharedTasks &t);

 	std::vector<SharedTaskActivityStateEntry> m_shared_task_activity_state;
 	std::vector<SharedTaskMember>             m_members;
@@ -425,17 +425,13 @@ bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id) {

 int32 SharedDatabase::GetSharedPlatinum(uint32 account_id)
 {
-	const std::string query = StringFormat("SELECT sharedplat FROM account WHERE id = '%i'", account_id);
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-		return false;
-    }
-
-    if (results.RowCount() != 1)
-        return 0;
-
-	auto& row = results.begin();
+	const auto query   = fmt::format("SELECT sharedplat FROM account WHERE id = {}", account_id);
+	auto       results = QueryDatabase(query);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
+	}

+	auto row = results.begin();
 	return Strings::ToInt(row[0]);
 }

@@ -499,25 +495,32 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 {
 	std::string query;

-	if (is_charid)
-		query = StringFormat("SELECT sb.slotid, sb.itemid, sb.charges, "
-				     "sb.augslot1, sb.augslot2, sb.augslot3, "
-				     "sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
-				     "FROM sharedbank sb INNER JOIN character_data ch "
-				     "ON ch.account_id=sb.acctid WHERE ch.id = %i ORDER BY sb.slotid",
-				     id);
-	else
-		query = StringFormat("SELECT slotid, itemid, charges, "
-				     "augslot1, augslot2, augslot3, "
-				     "augslot4, augslot5, augslot6, custom_data "
-				     "FROM sharedbank WHERE acctid=%i ORDER BY slotid",
-				     id);
+	if (is_charid) {
+		query = fmt::format(
+			"SELECT sb.slotid, sb.itemid, sb.charges, "
+			"sb.augslot1, sb.augslot2, sb.augslot3, "
+			"sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
+			"FROM sharedbank sb INNER JOIN character_data ch "
+			"ON ch.account_id = sb.acctid WHERE ch.id = {} ORDER BY sb.slotid",
+			id
+		);
+	} else {
+		query = fmt::format(
+			"SELECT slotid, itemid, charges, "
+			"augslot1, augslot2, augslot3, "
+			"augslot4, augslot5, augslot6, custom_data "
+			"FROM sharedbank WHERE acctid = {} ORDER BY slotid",
+			id
+		);
+	}
+
 	auto results = QueryDatabase(query);
+	// If we have no results we still need to return true
 	if (!results.Success()) {
 		return false;
 	}

-	for (auto& row = results.begin(); row != results.end(); ++row) {
+	for (auto row : results) {
 		int16 slot_id = static_cast<int16>(Strings::ToInt(row[0]));
 		uint32 item_id = Strings::ToUnsignedInt(row[1]);
 		const int16 charges = static_cast<int16>(Strings::ToInt(row[2]));
@@ -533,16 +536,26 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 		const EQ::ItemData *item = GetItem(item_id);

 		if (!item) {
-			LogError("Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
-				((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
+			LogError(
+				"Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
+				is_charid ? "charid" : "acctid",
+				id,
+				item_id,
+				slot_id
+			);
+			continue;
+		}
+
+		auto inst = CreateBaseItem(item, charges);
+		if (!inst) {
 			continue;
 		}

-		EQ::ItemInstance *inst = CreateBaseItem(item, charges);
 		if (inst && item->IsClassCommon()) {
 			for (int i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
-				if (aug[i])
+				if (aug[i]) {
 					inst->PutAugment(this, i, aug[i]);
+				}
 			}
 		}

@@ -556,14 +569,21 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQ::InventoryProfile *inv, bool is
 		safe_delete(inst);

 		// Save ptr to item in inventory
-		if (put_slot_id != INVALID_INDEX)
+		if (put_slot_id != INVALID_INDEX) {
 			continue;
+		}

-		LogError("Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
-			((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
+		LogError(
+			"Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
+			is_charid ? "charid" : "acctid",
+			id,
+			item_id,
+			slot_id
+		);

-		if (is_charid)
+		if (is_charid) {
 			SaveInventory(id, nullptr, slot_id);
+		}
 	}

 	return true;
@@ -619,7 +639,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
 		}
 		else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { // Titanium check
 			const auto parent_index = ((slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
-			if (parent_index < EQ::invslot::SLOT_BEGIN || parent_index >= bank_size) {
+			if (parent_index >= bank_size) {
 				cv_conflict = true;
 				continue;
 			}
@@ -1564,24 +1584,28 @@ EQ::ItemInstance* SharedDatabase::CreateBaseItem(const EQ::ItemData* item, int16
 	if (item) {
 		// if maxcharges is -1 that means it is an unlimited use item.
 		// set it to 1 charge so that it is usable on creation
-		if (charges == 0 && item->MaxCharges == -1)
+		if (charges == 0 && item->MaxCharges == -1) {
 			charges = 1;
+		}
+
 		// Stackable items need a minimum charge of 1 to remain moveable.
-		if(charges <= 0 && item->Stackable)
+		if (charges <= 0 && item->Stackable) {
 			charges = 1;
+		}

 		inst = new EQ::ItemInstance(item, charges);

-		if (inst == nullptr) {
+		if (!inst) {
 			LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateBaseItem()");
 			LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
 			return nullptr;
 		}

-		if(item->CharmFileID != 0 || (item->LoreGroup >= 1000 && item->LoreGroup != -1)) {
+		if (item->CharmFileID != 0 || item->LoreGroup >= 1000) {
 			inst->Initialize(this);
 		}
 	}
+
 	return inst;
 }

@@ -148,33 +148,6 @@ int32 EQ::skills::GetBaseDamage(SkillType skill)
 	}
 }

-bool EQ::skills::IsMeleeDmg(SkillType skill)
-{
-	switch (skill) {
-	case Skill1HBlunt:
-	case Skill1HSlashing:
-	case Skill2HBlunt:
-	case Skill2HSlashing:
-	case SkillBackstab:
-	case SkillBash:
-	case SkillDragonPunch:
-	case SkillEagleStrike:
-	case SkillFlyingKick:
-	case SkillHandtoHand:
-	case SkillKick:
-	case Skill1HPiercing:
-	case SkillRiposte:
-	case SkillRoundKick:
-	case SkillThrowing:
-	case SkillTigerClaw:
-	case SkillFrenzy:
-	case Skill2HPiercing:
-		return true;
-	default:
-		return false;
-	}
-}
-
 const std::map<EQ::skills::SkillType, std::string>& EQ::skills::GetSkillTypeMap()
 {
 	static const std::map<SkillType, std::string> skill_type_map = {
@@ -168,7 +168,6 @@ namespace EQ
 		bool IsBardInstrumentSkill(SkillType skill);
 		bool IsCastingSkill(SkillType skill);
 		int32 GetBaseDamage(SkillType skill);
-		bool IsMeleeDmg(SkillType skill);

 		extern const std::map<SkillType, std::string>& GetSkillTypeMap();
 		extern const std::vector<SkillType>& GetExtraDamageSkills();
@@ -658,11 +658,11 @@ typedef pdb_symbol current;
 			size_t next = 0;
 			size_t delimiter_size = sizeof(kBackwardPathDelimiter) - 1;
 			while ((next = s.find(kBackwardPathDelimiter, last)) != std::string::npos) {
-				out.push_back(s.substr(last, next - last));
+				out.emplace_back(s.substr(last, next - last));
 				last = next + delimiter_size;
 			}
 			if (last <= s.length()) {
-				out.push_back(s.substr(last));
+				out.emplace_back(s.substr(last));
 			}
 			return out;
 		}
@@ -3760,7 +3760,7 @@ private:
 						continue;
 					started = true;
 				}
-				lines.push_back(make_pair(line_idx, line));
+				lines.emplace_back(make_pair(line_idx, line));
 			}

 			lines.erase(
@@ -76,7 +76,7 @@ std::vector<std::string> Strings::Split(const std::string& s, const std::string&
 		res.push_back(token);
 	}

-	res.push_back(s.substr(pos_start));
+	res.emplace_back(s.substr(pos_start));
 	return res;
 }

@@ -287,15 +287,12 @@ std::string Strings::Commify(const std::string &number)
 	for (i = string_length - 3; i >= 0; i -= 3) {
 		if (i > 0) {
 			temp_string = "," + number.substr(static_cast<unsigned long>(i), 3) + temp_string;
-		}
-		else {
+		} else {
 			temp_string = number.substr(static_cast<unsigned long>(i), 3) + temp_string;
 		}
 	}

-	if (i < 0) {
-		temp_string = number.substr(0, static_cast<unsigned long>(3 + i)) + temp_string;
-	}
+	temp_string = number.substr(0, static_cast<unsigned long>(3 + i)) + temp_string;

 	return temp_string;
 }
@@ -219,7 +219,7 @@ std::vector<std::string> join_pair(
 	std::vector<std::string> output;

 	for (const std::pair<T1, T2> &src_iter: src) {
-		output.push_back(
+		output.emplace_back(

 			fmt::format(
 				"{}{}{}{}{}{}{}",
@@ -253,7 +253,7 @@ std::vector<std::string> join_tuple(

 	for (const std::tuple<T1, T2, T3, T4> &src_iter: src) {

-		output.push_back(
+		output.emplace_back(

 			fmt::format(
 				"{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
@@ -57,9 +57,6 @@ typedef const char Const_char;	//for perl XS

 #define safe_delete(d) if(d) { delete d; d=nullptr; }
 #define safe_delete_array(d) if(d) { delete[] d; d=nullptr; }
-#define L32(i)	((uint32) i)
-#define H32(i)	((uint32) (i >> 32))
-#define L16(i)	((uint16) i)

 #ifndef WIN32
 // More WIN32 compatability
@@ -25,7 +25,7 @@

 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "22.8.2-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "22.10.0-dev" // always append -dev to the current version for custom-builds
 #define LOGIN_VERSION "0.8.0"
 #define COMPILE_DATE    __DATE__
 #define COMPILE_TIME    __TIME__
@@ -44,7 +44,7 @@

 #define CURRENT_BINARY_DATABASE_VERSION 9227

-#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9038
+#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9039

 #endif

@@ -174,7 +174,7 @@ ZoneRepository::Zone *ZoneStore::GetZone(const char *in_zone_name)
 	return nullptr;
 }

-ZoneRepository::Zone *ZoneStore::GetZone(std::string in_zone_name)
+ZoneRepository::Zone *ZoneStore::GetZone(const std::string& in_zone_name)
 {
 	for (auto &z: m_zones) {
 		if (z.short_name == in_zone_name) {
@@ -35,7 +35,7 @@ public:

 	ZoneRepository::Zone *GetZone(uint32 zone_id, int version = 0);
 	ZoneRepository::Zone *GetZone(const char *in_zone_name);
-	ZoneRepository::Zone *GetZone(std::string in_zone_name);
+	ZoneRepository::Zone *GetZone(const std::string& in_zone_name);
 	uint32 GetZoneID(const char *in_zone_name);
 	uint32 GetZoneID(std::string zone_name);
 	std::string GetZoneName(uint32 zone_id);
@@ -53,7 +53,7 @@ extern ZoneStore zone_store;
 * Global helpers
 */
 inline uint32 ZoneID(const char *in_zone_name) { return zone_store.GetZoneID(in_zone_name); }
-inline uint32 ZoneID(std::string zone_name) { return zone_store.GetZoneID(zone_name); }
+inline uint32 ZoneID(const std::string& zone_name) { return zone_store.GetZoneID(zone_name); }
 inline const char *ZoneName(uint32 zone_id, bool error_unknown = false)
 {
 	return zone_store.GetZoneName(
@@ -489,7 +489,7 @@ bool Client::VerifyLoginHash(
 * @param db_loginserver
 */
 void Client::DoSuccessfulLogin(
-	const std::string in_account_name,
+	const std::string& in_account_name,
 	int db_account_id,
 	const std::string &db_loginserver
 )
@@ -175,7 +175,7 @@ public:
 		const std::string &password_hash
 	);

-	void DoSuccessfulLogin(const std::string in_account_name, int db_account_id, const std::string &db_loginserver);
+	void DoSuccessfulLogin(const std::string& in_account_name, int db_account_id, const std::string &db_loginserver);
 	void CreateLocalAccount(const std::string &username, const std::string &password);
 	void CreateEQEmuAccount(const std::string &in_account_name, const std::string &in_account_password, unsigned int loginserver_account_id);

@@ -490,7 +490,7 @@ namespace LoginserverWebserver {
 				token_data.can_write
 			);

-			server.token_manager->loaded_api_tokens.insert(
+			server.token_manager->loaded_api_tokens.emplace(
 				std::make_pair(
 					token_data.token,
 					token_data
@@ -71,10 +71,10 @@ public:
 	inline void AutoLinkAccounts(bool b) { auto_link_accounts = b; }
 	inline bool CanAutoLinkAccounts() const { return auto_link_accounts; }

-	inline void EQEmuLoginServerAddress(std::string v) { eqemu_loginserver_address = v; }
+	inline void EQEmuLoginServerAddress(const std::string& v) { eqemu_loginserver_address = v; }
 	inline std::string GetEQEmuLoginServerAddress() const { return eqemu_loginserver_address; }

-	inline void DefaultLoginServerName(std::string v) { default_loginserver_name = v; }
+	inline void DefaultLoginServerName(const std::string& v) { default_loginserver_name = v; }
 	inline std::string GetDefaultLoginServerName() const { return default_loginserver_name; }

 	inline void UpdateInsecurePasswords(bool b) { update_insecure_passwords = b; }
@@ -1,6 +1,6 @@
 {
  "name": "eqemu-server",
-  "version": "22.8.2",
+  "version": "22.10.0",
  "repository": {
    "type": "git",
    "url": "https://github.com/EQEmu/Server.git"
@@ -32,7 +32,7 @@ void ServerToClient45SayLink(std::string& clientSayLink, const std::string& serv
 void ServerToClient50SayLink(std::string& clientSayLink, const std::string& serverSayLink);
 void ServerToClient55SayLink(std::string& clientSayLink, const std::string& serverSayLink);

-ChatChannel::ChatChannel(std::string inName, std::string inOwner, std::string inPassword, bool inPermanent, int inMinimumStatus) :
+ChatChannel::ChatChannel(const std::string& inName, const std::string& inOwner, const std::string& inPassword, bool inPermanent, int inMinimumStatus) :
 	m_delete_timer(0) {

 	m_name = inName;
@@ -137,7 +137,7 @@ ChatChannel *ChatChannelList::CreateChannel(
 	return new_channel;
 }

-ChatChannel* ChatChannelList::FindChannel(std::string Name) {
+ChatChannel* ChatChannelList::FindChannel(const std::string& Name) {

 	std::string normalized_name = CapitaliseName(Name);

@@ -283,7 +283,7 @@ void ChatChannel::SetPassword(const std::string& in_password) {
 	}
 }

-void ChatChannel::SetOwner(std::string& in_owner) {
+void ChatChannel::SetOwner(const std::string& in_owner) {

 	m_owner = in_owner;

@@ -659,7 +659,7 @@ ChatChannel *ChatChannelList::RemoveClientFromChannel(const std::string& in_chan
 	std::string channel_name = in_channel_name;

 	if (in_channel_name.length() > 0 && isdigit(channel_name[0])) {
-		channel_name = c->ChannelSlotName(Strings::ToInt(in_channel_name.c_str()));
+		channel_name = c->ChannelSlotName(Strings::ToInt(in_channel_name));
 	}

 	auto *required_channel = FindChannel(channel_name);
@@ -701,11 +701,11 @@ void ChatChannelList::Process() {
 			LogDebug("Empty temporary password protected channel [{}] being destroyed",
 				CurrentChannel->GetName().c_str());

-			RemoveChannel(CurrentChannel);
+			iterator.RemoveCurrent();
+		}
+		else {
+			iterator.Advance();
 		}
-
-		iterator.Advance();
-
 	}
 }

@@ -784,7 +784,7 @@ bool ChatChannel::HasVoice(std::string inVoiced)
 	return std::find(std::begin(m_voiced), std::end(m_voiced), inVoiced) != std::end(m_voiced);
 }

-std::string CapitaliseName(std::string inString) {
+std::string CapitaliseName(const std::string& inString) {

 	std::string NormalisedName = inString;

@@ -15,7 +15,7 @@ class ChatChannel {

 public:

-	ChatChannel(std::string inName, std::string inOwner, std::string inPassword, bool inPermanent, int inMinimumStatus = 0);
+	ChatChannel(const std::string& inName, const std::string& inOwner, const std::string& inPassword, bool inPermanent, int inMinimumStatus = 0);
 	~ChatChannel();

 	void AddClient(Client *c);
@@ -29,7 +29,7 @@ public:
 	void SetPassword(const std::string& in_password);
 	bool IsOwner(const std::string& name) { return (m_owner == name); }
 	const std::string& GetPassword() { return m_password; }
-	void SetOwner(std::string& inOwner);
+	void SetOwner(const std::string& in_owner);
 	std::string& GetOwnerName();
 	void SetTemporary();
 	void SetPermanent();
@@ -76,7 +76,7 @@ class ChatChannelList {

 public:
 	ChatChannel* CreateChannel(const std::string& name, const std::string& owner, const std::string& password, bool permanent, int minimum_status, bool save_to_database = false);
-	ChatChannel* FindChannel(std::string name);
+	ChatChannel* FindChannel(const std::string& name);
 	ChatChannel* AddClientToChannel(std::string channel_name, Client* c, bool command_directed = false);
 	ChatChannel* RemoveClientFromChannel(const std::string& in_channel_name, Client* c, bool command_directed = false);
 	void RemoveChannel(ChatChannel *Channel);
@@ -91,8 +91,8 @@ public:
 	static void AddToFilteredNames(const std::string& name);
 	static bool IsOnChannelBlockList(const std::string& channel_name);
 	static bool IsOnFilteredNameList(const std::string& channel_name);
-	static inline void SetChannelBlockList(std::vector<std::string> new_list) { m_blocked_channel_names = new_list; }
-	static inline void SetFilteredNameList(std::vector<std::string> new_list) { m_filtered_names = new_list; }
+	static inline void SetChannelBlockList(const std::vector<std::string>& new_list) { m_blocked_channel_names = new_list; }
+	static inline void SetFilteredNameList(const std::vector<std::string>& new_list) { m_filtered_names = new_list; }
 private:

 	LinkedList<ChatChannel*> ChatChannels;
@@ -101,6 +101,6 @@ private:

 };

-std::string CapitaliseName(std::string inString);
+std::string CapitaliseName(const std::string& inString);

 #endif
@@ -122,11 +122,11 @@ std::vector<std::string> ParseRecipients(std::string RecipientString) {

 		if (Comma == std::string::npos) {

-			RecipientList.push_back(RecipientString.substr(CurrentPos));
+			RecipientList.emplace_back(RecipientString.substr(CurrentPos));

 			break;
 		}
-		RecipientList.push_back(RecipientString.substr(CurrentPos, Comma - CurrentPos));
+		RecipientList.emplace_back(RecipientString.substr(CurrentPos, Comma - CurrentPos));

 		CurrentPos = Comma + 2;
 	}
@@ -348,7 +348,7 @@ static void ProcessMailTo(Client *c, std::string MailMessage) {
 	}
 }

-static void ProcessMailTo(Client *c, std::string from, std::string subject, std::string message) {
+static void ProcessMailTo(Client *c, const std::string& from, const std::string& subject, const std::string& message) {
 }

 static void ProcessSetMessageStatus(std::string SetMessageCommand) {
@@ -379,14 +379,14 @@ static void ProcessSetMessageStatus(std::string SetMessageCommand) {

 		if (NumEnd == std::string::npos) {

-			MessageNumber = Strings::ToInt(SetMessageCommand.substr(NumStart).c_str());
+			MessageNumber = Strings::ToInt(SetMessageCommand.substr(NumStart));

 			database.SetMessageStatus(MessageNumber, Status);

 			break;
 		}

-		MessageNumber = Strings::ToInt(SetMessageCommand.substr(NumStart, NumEnd - NumStart).c_str());
+		MessageNumber = Strings::ToInt(SetMessageCommand.substr(NumStart, NumEnd - NumStart));

 		database.SetMessageStatus(MessageNumber, Status);

@@ -878,7 +878,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, std::string command_string, boo
 		break;

 	case CommandGetBody:
-		database.SendBody(c, Strings::ToInt(parameters.c_str()));
+		database.SendBody(c, Strings::ToInt(parameters));
 		break;

 	case CommandMailTo:
@@ -893,7 +893,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, std::string command_string, boo
 	case CommandSelectMailBox:
 	{
 		std::string::size_type NumStart = parameters.find_first_of("0123456789");
-		c->ChangeMailBox(Strings::ToInt(parameters.substr(NumStart).c_str()));
+		c->ChangeMailBox(Strings::ToInt(parameters.substr(NumStart)));
 		break;
 	}
 	case CommandSetMailForwarding:
@@ -983,7 +983,7 @@ void Client::SendMailBoxes() {
 	safe_delete(outapp);
 }

-Client *Clientlist::FindCharacter(std::string CharacterName) {
+Client *Clientlist::FindCharacter(const std::string& CharacterName) {

 	std::list<Client*>::iterator Iterator;

@@ -1243,7 +1243,7 @@ void Client::LeaveAllChannels(bool send_updated_channel_list, bool command_direc
 }


-void Client::ProcessChannelList(std::string Input) {
+void Client::ProcessChannelList(const std::string& Input) {

 	if (Input.length() == 0) {

@@ -1255,7 +1255,7 @@ void Client::ProcessChannelList(std::string Input) {
 	std::string ChannelName = Input;

 	if (isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);

@@ -1416,7 +1416,7 @@ void Client::SendChannelMessageByNumber(std::string Message) {
 	if (MessageStart == std::string::npos)
 		return;

-	int ChannelNumber = Strings::ToInt(Message.substr(0, MessageStart).c_str());
+	int ChannelNumber = Strings::ToInt(Message.substr(0, MessageStart));

 	if ((ChannelNumber < 1) || (ChannelNumber > MAX_JOINED_CHANNELS)) {

@@ -1521,7 +1521,7 @@ void Client::SendChannelMessageByNumber(std::string Message) {

 }

-void Client::SendChannelMessage(std::string ChannelName, std::string Message, Client *Sender) {
+void Client::SendChannelMessage(const std::string& ChannelName, const std::string& Message, Client *Sender) {

 	if (!Sender) return;

@@ -1548,7 +1548,7 @@ void Client::SendChannelMessage(std::string ChannelName, std::string Message, Cl
 	safe_delete(outapp);
 }

-void Client::ToggleAnnounce(std::string State)
+void Client::ToggleAnnounce(const std::string& State)
 {
 	if (State == "")
 		Announce = !Announce;
@@ -1615,7 +1615,7 @@ void Client::GeneralChannelMessage(const char *Characters) {

 }

-void Client::GeneralChannelMessage(std::string Message) {
+void Client::GeneralChannelMessage(const std::string& Message) {

 	auto outapp = new EQApplicationPacket(OP_ChannelMessage, Message.length() + 3);
 	char *PacketBuffer = (char *)outapp->pBuffer;
@@ -1659,7 +1659,7 @@ void Client::SetChannelPassword(std::string ChannelPassword) {
 	std::string ChannelName = ChannelPassword.substr(ChannelStart);

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	std::string Message;

@@ -1724,7 +1724,7 @@ void Client::SetChannelOwner(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	LogInfo("Set owner of channel [[{}]] to [[{}]]", ChannelName.c_str(), NewOwner.c_str());

@@ -1770,7 +1770,7 @@ void Client::OPList(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);

@@ -1813,7 +1813,7 @@ void Client::ChannelInvite(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	LogInfo("[[{}]] invites [[{}]] to channel [[{}]]", GetName().c_str(), Invitee.c_str(), ChannelName.c_str());

@@ -1883,7 +1883,7 @@ void Client::ChannelModerate(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);

@@ -1941,7 +1941,7 @@ void Client::ChannelGrantModerator(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	LogInfo("[[{}]] gives [[{}]] moderator rights to channel [[{}]]", GetName().c_str(), Moderator.c_str(), ChannelName.c_str());

@@ -2022,7 +2022,7 @@ void Client::ChannelGrantVoice(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	LogInfo("[[{}]] gives [[{}]] voice to channel [[{}]]", GetName().c_str(), Voicee.c_str(), ChannelName.c_str());

@@ -2110,7 +2110,7 @@ void Client::ChannelKick(std::string CommandString) {
 	std::string ChannelName = CapitaliseName(CommandString.substr(ChannelStart));

 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
-		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName.c_str()));
+		ChannelName = ChannelSlotName(Strings::ToInt(ChannelName));

 	LogInfo("[[{}]] kicks [[{}]] from channel [[{}]]", GetName().c_str(), Kickee.c_str(), ChannelName.c_str());

@@ -2279,7 +2279,7 @@ void Client::SetConnectionType(char c) {
 	}
 }

-Client *Clientlist::IsCharacterOnline(std::string CharacterName) {
+Client *Clientlist::IsCharacterOnline(const std::string& CharacterName) {

 	// This method is used to determine if the character we are a sending an email to is connected to the mailserver,
 	// so we can send them a new email notification.
@@ -2307,7 +2307,7 @@ Client *Clientlist::IsCharacterOnline(std::string CharacterName) {
 	return nullptr;
 }

-int Client::GetMailBoxNumber(std::string CharacterName) {
+int Client::GetMailBoxNumber(const std::string& CharacterName) {

 	for (unsigned int i = 0; i < Characters.size(); i++)
 		if (Characters[i].Name == CharacterName)
@@ -2316,7 +2316,7 @@ int Client::GetMailBoxNumber(std::string CharacterName) {
 	return -1;
 }

-void Client::SendNotification(int MailBoxNumber, std::string Subject, std::string From, int MessageID) {
+void Client::SendNotification(int MailBoxNumber, const std::string& Subject, const std::string& From, int MessageID) {

 	char TimeStamp[100];

@@ -98,18 +98,18 @@ public:
 	void AddToChannelList(ChatChannel *JoinedChannel);
 	void RemoveFromChannelList(ChatChannel *JoinedChannel);
 	void SendChannelMessage(std::string Message);
-	void SendChannelMessage(std::string ChannelName, std::string Message, Client *Sender);
+	void SendChannelMessage(const std::string& ChannelName, const std::string& Message, Client *Sender);
 	void SendChannelMessageByNumber(std::string Message);
 	void SendChannelList();
 	void CloseConnection();
-	void ToggleAnnounce(std::string State);
+	void ToggleAnnounce(const std::string& State);
 	bool IsAnnounceOn() { return (Announce == true); }
 	void AnnounceJoin(ChatChannel *Channel, Client *c);
 	void AnnounceLeave(ChatChannel *Channel, Client *c);
-	void GeneralChannelMessage(std::string Message);
+	void GeneralChannelMessage(const std::string& Message);
 	void GeneralChannelMessage(const char *Characters);
 	void SetChannelPassword(std::string ChannelPassword);
-	void ProcessChannelList(std::string CommandString);
+	void ProcessChannelList(const std::string& Input);
 	void AccountUpdate();
 	int ChannelCount();
 	std::string RemoveDuplicateChannels(std::string& in_channels);
@@ -139,14 +139,14 @@ public:
 	inline bool GetForceDisconnect() { return ForceDisconnect; }
 	std::string MailBoxName();
 	int GetMailBoxNumber() { return CurrentMailBox; }
-	int GetMailBoxNumber(std::string CharacterName);
+	int GetMailBoxNumber(const std::string& CharacterName);

 	void SetConnectionType(char c);
 	ConnectionType GetConnectionType() { return TypeOfConnection; }
 	EQ::versions::ClientVersion GetClientVersion() { return ClientVersion_; }

 	inline bool IsMailConnection() { return (TypeOfConnection == ConnectionTypeMail) || (TypeOfConnection == ConnectionTypeCombined); }
-	void SendNotification(int MailBoxNumber, std::string From, std::string Subject, int MessageID);
+	void SendNotification(int MailBoxNumber, const std::string& Subject, const std::string& From, int MessageID);
 	void ChangeMailBox(int NewMailBox);
 	inline void SetMailBox(int NewMailBox) { CurrentMailBox = NewMailBox; }
 	void SendFriends();
@@ -184,10 +184,10 @@ public:
 	Clientlist(int MailPort);
 	void	Process();
 	void	CloseAllConnections();
-	Client *FindCharacter(std::string CharacterName);
+	Client *FindCharacter(const std::string& CharacterName);
 	void	CheckForStaleConnectionsAll();
 	void	CheckForStaleConnections(Client *c);
-	Client *IsCharacterOnline(std::string CharacterName);
+	Client *IsCharacterOnline(const std::string& CharacterName);
 	void ProcessOPMailCommand(Client* c, std::string command_string, bool command_directed = false);

 private:
@@ -142,7 +142,7 @@ int UCSDatabase::FindAccount(const char *characterName, Client *client)
 	return accountID;
 }

-bool UCSDatabase::VerifyMailKey(std::string characterName, int IPAddress, std::string MailKey)
+bool UCSDatabase::VerifyMailKey(const std::string& characterName, int IPAddress, const std::string& MailKey)
 {

 	std::string query = StringFormat(
@@ -40,7 +40,7 @@ class UCSDatabase : public Database {
 public:
 	int FindAccount(const char *CharacterName, Client *c);
 	int FindCharacter(const char *CharacterName);
-	bool VerifyMailKey(std::string CharacterName, int IPAddress, std::string MailKey);
+	bool VerifyMailKey(const std::string& characterName, int IPAddress, const std::string& MailKey);
 	bool GetVariable(const char* varname, char* varvalue, uint16 varvalue_len);
 	bool LoadChatChannels();
 	void LoadReservedNamesFromDB();
@@ -43,7 +43,7 @@ extern const ucsconfig *Config;
 extern UCSDatabase       database;
 extern DiscordManager  discord_manager;

-void ProcessMailTo(Client *c, std::string from, std::string subject, std::string message);
+void ProcessMailTo(Client *c, const std::string& from, const std::string& subject, const std::string& message);

 void Client45ToServerSayLink(std::string& serverSayLink, const std::string& clientSayLink);
 void Client50ToServerSayLink(std::string& serverSayLink, const std::string& clientSayLink);
@@ -37,6 +37,7 @@
 9036|2023_01_19_drop_bot_views.sql|SHOW TABLES LIKE 'vw_groups'|not_empty|
 9037|2023_01_22_add_name_index.sql||show index from bot_data WHERE key_name = 'name`|empty|
 9038|2023_02_16_add_caster_range.sql|SHOW COLUMNS FROM `bot_data` LIKE 'caster_range'|empty|
+9039|2023_03_31_remove_bot_groups.sql|SHOW TABLES LIKE 'bot_groups'|not_empty|

 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not
@@ -0,0 +1,4 @@
+SET FOREIGN_KEY_CHECKS = 0;
+DROP TABLE IF EXISTS `bot_groups`;
+DROP TABLE IF EXISTS `bot_group_members`;
+SET FOREIGN_KEY_CHECKS = 1;
@@ -82,7 +82,7 @@ void Adventure::RemovePlayer(std::string character_name)
 	}
 }

-bool Adventure::PlayerExists(std::string character_name)
+bool Adventure::PlayerExists(const std::string& character_name)
 {
 	auto iter = players.begin();
 	while(iter != players.end())
@@ -71,7 +71,7 @@ public:
 	bool IsActive();
 	void AddPlayer(std::string character_name, bool add_client_to_instance = true);
 	void RemovePlayer(std::string character_name);
-	bool PlayerExists(std::string character_name);
+	bool PlayerExists(const std::string& character_name);
 	bool CreateInstance();
 	void IncrementCount();
 	void IncrementAssassinationCount();
@@ -36,9 +36,7 @@ void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std:
 		s->SetDumpPath(cmd("--dump-path").str());
 	}

-	/**
-	 * Set Option
-	 */
+	// options
 	s->SetDumpContentTables(cmd[{"--content-tables"}] || dump_all);
 	s->SetDumpLoginServerTables(cmd[{"--login-tables"}] || dump_all);
 	s->SetDumpPlayerTables(cmd[{"--player-tables"}] || dump_all);
@@ -48,15 +46,11 @@ void WorldserverCLI::DatabaseDump(int argc, char **argv, argh::parser &cmd, std:
 	s->SetDumpSystemTables(cmd[{"--system-tables"}] || dump_all);
 	s->SetDumpQueryServerTables(cmd[{"--query-serv-tables"}] || dump_all);
 	s->SetDumpAllTables(dump_all);
-
 	s->SetDumpWithNoData(cmd[{"--table-structure-only"}]);
 	s->SetDumpTableLock(cmd[{"--table-lock"}]);
 	s->SetDumpWithCompression(cmd[{"--compress"}]);
 	s->SetDumpOutputToConsole(cmd[{"--dump-output-to-console"}]);
 	s->SetDumpDropTableSyntaxOnly(cmd[{"--drop-table-syntax-only"}]);

-	/**
-	 * Dump
-	 */
-	s->Dump();
+	s->DatabaseDump();
 }
@@ -1258,7 +1258,7 @@ bool Client::ChecksumVerificationCRCEQGame(uint64 checksum)
 	std::string checksumvar;
 	uint64_t    checksumint;
 	if (database.GetVariable("crc_eqgame", checksumvar)) {
-		checksumint = Strings::ToBigInt(checksumvar.c_str());
+		checksumint = Strings::ToBigInt(checksumvar);
 	}
 	else {
 		LogChecksumVerification("variable not set in variables table.");
@@ -1281,7 +1281,7 @@ bool Client::ChecksumVerificationCRCSkillCaps(uint64 checksum)
 	std::string checksumvar;
 	uint64_t    checksumint;
 	if (database.GetVariable("crc_skillcaps", checksumvar)) {
-		checksumint = Strings::ToBigInt(checksumvar.c_str());
+		checksumint = Strings::ToBigInt(checksumvar);
 	}
 	else {
 		LogChecksumVerification("[checksum_crc2_skillcaps] variable not set in variables table.");
@@ -1304,7 +1304,7 @@ bool Client::ChecksumVerificationCRCBaseData(uint64 checksum)
 	std::string checksumvar;
 	uint64_t    checksumint;
 	if (database.GetVariable("crc_basedata", checksumvar)) {
-		checksumint = Strings::ToBigInt(checksumvar.c_str());
+		checksumint = Strings::ToBigInt(checksumvar);
 	}
 	else {
 		LogChecksumVerification("variable not set in variables table.");
@@ -360,7 +360,7 @@ bool ClientListEntry::CheckAuth(uint32 loginserver_account_id, const char *key_p
 		}
 		std::string lsworldadmin;
 		if (database.GetVariable("honorlsworldadmin", lsworldadmin)) {
-			if (Strings::ToInt(lsworldadmin.c_str()) == 1 && pworldadmin != 0 && (padmin < pworldadmin || padmin == AccountStatus::Player)) {
+			if (Strings::ToInt(lsworldadmin) == 1 && pworldadmin != 0 && (padmin < pworldadmin || padmin == AccountStatus::Player)) {
 				padmin = pworldadmin;
 			}
 		}
@@ -268,8 +268,8 @@ void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnect
 		strcpy(newline, "\r\n");
 	else
 		strcpy(newline, "^");
-	std::vector<char> out;

+	auto out = fmt::memory_buffer();
 	iterator.Reset();
 	while(iterator.MoreElements()) {
 		ClientListEntry* cle = iterator.GetData();
@@ -1008,7 +1008,7 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct*
 	if (whom)
 		whomlen = strlen(whom->whom);

-	std::vector<char> out;
+	auto out = fmt::memory_buffer();
 	fmt::format_to(std::back_inserter(out), "Players on server:");
 	if (connection->IsConsole())
 		fmt::format_to(std::back_inserter(out), "\r\n");
@@ -166,14 +166,14 @@ void ConsoleWho(
 		}
 		else if (Strings::IsNumber(arg)) {
 			if (whom.lvllow == 0xFFFF) {
-				whom.lvllow  = Strings::ToInt(arg.c_str());
+				whom.lvllow  = Strings::ToInt(arg);
 				whom.lvlhigh = whom.lvllow;
 			}
-			else if (Strings::ToInt(arg.c_str()) > int(whom.lvllow)) {
-				whom.lvlhigh = Strings::ToInt(arg.c_str());
+			else if (Strings::ToInt(arg) > int(whom.lvllow)) {
+				whom.lvlhigh = Strings::ToInt(arg);
 			}
 			else {
-				whom.lvllow = Strings::ToInt(arg.c_str());
+				whom.lvllow = Strings::ToInt(arg);
 			}
 		}
 		else {
@@ -200,11 +200,11 @@ void ConsoleUptime(
 		return;
 	}

-	if (Strings::IsNumber(args[0]) && Strings::ToInt(args[0].c_str()) > 0) {
+	if (Strings::IsNumber(args[0]) && Strings::ToInt(args[0]) > 0) {
 		auto                pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct));
 		ServerUptime_Struct *sus = (ServerUptime_Struct *) pack->pBuffer;
 		snprintf(sus->adminname, sizeof(sus->adminname), "*%s", connection->UserName().c_str());
-		sus->zoneserverid = Strings::ToInt(args[0].c_str());
+		sus->zoneserverid = Strings::ToInt(args[0]);
 		ZoneServer *zs = zoneserver_list.FindByID(sus->zoneserverid);
 		if (zs) {
 			zs->SendPacket(pack);
@@ -284,7 +284,7 @@ void ConsoleEmote(
 			0,
 			0,
 			AccountStatus::Player,
-			Strings::ToInt(args[1].c_str()),
+			Strings::ToInt(args[1]),
 			Strings::Join(join_args, " ").c_str()
 		);
 	}
@@ -295,7 +295,7 @@ void ConsoleEmote(
 				0,
 				0,
 				AccountStatus::Player,
-				Strings::ToInt(args[1].c_str()),
+				Strings::ToInt(args[1]),
 				Strings::Join(join_args, " ").c_str()
 			);
 		}
@@ -304,7 +304,7 @@ void ConsoleEmote(
 				args[0].c_str(),
 				0,
 				AccountStatus::Player,
-				Strings::ToInt(args[1].c_str()),
+				Strings::ToInt(args[1]),
 				Strings::Join(join_args, " ").c_str()
 			);
 		}
@@ -585,7 +585,7 @@ void ConsoleZoneShutdown(
 		pack->opcode = ServerOP_ZoneShutdown;
 		strcpy(s->adminname, tmpname);
 		if (Strings::IsNumber(args[0])) {
-			s->ZoneServerID = Strings::ToInt(args[0].c_str());
+			s->ZoneServerID = Strings::ToInt(args[0]);
 		}
 		else {
 			s->zoneid = ZoneID(args[0].c_str());
@@ -639,12 +639,12 @@ void ConsoleZoneBootup(
 		if (args.size() > 2) {
 			zoneserver_list.SOPZoneBootup(
 				tmpname,
-				Strings::ToInt(args[0].c_str()),
+				Strings::ToInt(args[0]),
 				args[1].c_str(),
 				(bool) (strcasecmp(args[1].c_str(), "static") == 0));
 		}
 		else {
-			zoneserver_list.SOPZoneBootup(tmpname, Strings::ToInt(args[0].c_str()), args[1].c_str(), false);
+			zoneserver_list.SOPZoneBootup(tmpname, Strings::ToInt(args[0]), args[1].c_str(), false);
 		}
 	}
 }
@@ -751,10 +751,10 @@ void ConsoleFlag(
 		connection->SendLine("Usage: flag [status] [accountname]");
 	}
 	else {
-		if (Strings::ToInt(args[0].c_str()) > connection->Admin()) {
+		if (Strings::ToInt(args[0]) > connection->Admin()) {
 			connection->SendLine("You cannot set people's status to higher than your own");
 		}
-		else if (!database.SetAccountStatus(args[1].c_str(), Strings::ToInt(args[0].c_str()))) {
+		else if (!database.SetAccountStatus(args[1].c_str(), Strings::ToInt(args[0]))) {
 			connection->SendLine("Unable to flag account!");
 		}
 		else {
@@ -821,8 +821,8 @@ void ConsoleWorldShutdown(
 {
 	if (args.size() == 2) {
 		int32 time, interval;
-		if (Strings::IsNumber(args[0]) && Strings::IsNumber(args[1]) && ((time = Strings::ToInt(args[0].c_str())) > 0) &&
-			((interval = Strings::ToInt(args[1].c_str())) > 0)) {
+		if (Strings::IsNumber(args[0]) && Strings::IsNumber(args[1]) && ((time = Strings::ToInt(args[0])) > 0) &&
+			((interval = Strings::ToInt(args[1])) > 0)) {
 			zoneserver_list.WorldShutDown(time, interval);
 		}
 		else {
@@ -886,7 +886,7 @@ void ConsoleSignalCharByName(
 		return;
 	}

-	connection->SendLine(StringFormat("Signal Sent to %s with ID %i", (char *) args[0].c_str(), Strings::ToInt(args[1].c_str())));
+	connection->SendLine(StringFormat("Signal Sent to %s with ID %i", (char *) args[0].c_str(), Strings::ToInt(args[1])));
 	uint32 message_len = strlen((char *) args[0].c_str()) + 1;
 	auto pack = new ServerPacket(ServerOP_CZSignal, sizeof(CZSignal_Struct) + message_len);
 	CZSignal_Struct* CZS = (CZSignal_Struct*) pack->pBuffer;
@@ -894,7 +894,7 @@ void ConsoleSignalCharByName(
 	int update_identifier = 0;
 	CZS->update_type = update_type;
 	CZS->update_identifier = update_identifier;
-	CZS->signal_id = Strings::ToInt(args[1].c_str());
+	CZS->signal_id = Strings::ToInt(args[1]);
 	strn0cpy(CZS->client_name, (char *) args[0].c_str(), 64);
 	zoneserver_list.SendPacket(pack);
 	safe_delete(pack);
@@ -106,7 +106,7 @@ void LauncherLink::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 		cur = result.begin();
 		end = result.end();
 		ZoneState zs;
-		for (; cur != end; cur++) {
+		for (; cur != end; ++cur) {
 			zs.port = cur->port;
 			zs.up = false;
 			zs.starts = 0;
@@ -232,7 +232,7 @@ void LauncherLink::BootDynamics(uint8 new_count) {
 		std::map<std::string, ZoneState>::iterator cur, end;
 		cur = m_states.begin();
 		end = m_states.end();
-		for (; cur != end; cur++) {
+		for (; cur != end; ++cur) {
 			StopZone(cur->first.c_str());
 		}
 	}
@@ -244,7 +244,7 @@ void LauncherLink::BootDynamics(uint8 new_count) {
 		std::map<std::string, ZoneState>::iterator cur, end;
 		cur = m_states.begin();
 		end = m_states.end();
-		for (; cur != end; cur++) {
+		for (; cur != end; ++cur) {
 			if (cur->first.find("dynamic_") == 0) {
 				if (found >= new_count) {
 					//this zone exceeds the number of allowed booted zones.
@@ -266,7 +266,7 @@ void LauncherLink::GetZoneList(std::vector<std::string> &l) {
 	std::map<std::string, ZoneState>::iterator cur, end;
 	cur = m_states.begin();
 	end = m_states.end();
-	for (; cur != end; cur++) {
+	for (; cur != end; ++cur) {
 		l.push_back(cur->first.c_str());
 	}
 }
@@ -52,7 +52,7 @@ LoginServerList::~LoginServerList() {
 void LoginServerList::Add(const char* iAddress, uint16 iPort, const char* Account, const char* Password, bool Legacy)
 {
 	auto loginserver = new LoginServer(iAddress, iPort, Account, Password, Legacy);
-	m_list.push_back(std::unique_ptr<LoginServer>(loginserver));
+	m_list.emplace_back(std::unique_ptr<LoginServer>(loginserver));
 }

 bool LoginServerList::SendStatus() {
@@ -21,7 +21,7 @@ void QueryServConnection::AddConnection(std::shared_ptr<EQ::Net::ServertalkServe
 	//Set handlers
 	connection->OnMessage(ServerOP_QueryServGeneric, std::bind(&QueryServConnection::HandleGenericMessage, this, std::placeholders::_1, std::placeholders::_2));
 	connection->OnMessage(ServerOP_LFGuildUpdate, std::bind(&QueryServConnection::HandleLFGuildUpdateMessage, this, std::placeholders::_1, std::placeholders::_2));
-	m_streams.insert(std::make_pair(connection->GetUUID(), connection));
+	m_streams.emplace(std::make_pair(connection->GetUUID(), connection));
 	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&QueryServConnection::OnKeepAlive, this, std::placeholders::_1));
 }

@@ -1545,7 +1545,7 @@ bool SharedTaskManager::CanAddPlayer(SharedTask *s, uint32_t character_id, std::
 void SharedTaskManager::RecordSharedTaskCompletion(SharedTask *s)
 {
 	// shared task
-	auto t  = s->GetDbSharedTask();
+	auto& t  = s->GetDbSharedTask();
 	auto ct = CompletedSharedTasksRepository::NewEntity();

 	ct.id              = t.id;
@@ -123,7 +123,7 @@ void WebInterface::SendEvent(const Json::Value &value)

 void WebInterface::AddCall(const std::string &method, WebInterfaceCall call)
 {
-	m_calls.insert(std::make_pair(method, call));
+	m_calls.emplace(std::make_pair(method, call));
 }

 void WebInterface::SendResponse(const std::string &id, const Json::Value &response)
@@ -146,7 +146,7 @@ WebInterfaceList::~WebInterfaceList()

 void WebInterfaceList::AddConnection(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection)
 {
-	m_interfaces.insert(std::make_pair(connection->GetUUID(), std::make_unique<WebInterface>(connection)));
+	m_interfaces.emplace(std::make_pair(connection->GetUUID(), std::make_unique<WebInterface>(connection)));
 }

 void WebInterfaceList::RemoveConnection(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection)
@@ -204,7 +204,7 @@ void WorldBoot::CheckForServerScript(bool force_download)
 		r.set_read_timeout(1, 0);
 		r.set_write_timeout(1, 0);

-		if (auto res = r.Get(u.get_path().c_str())) {
+		if (auto res = r.Get(u.get_path())) {
 			if (res->status == 200) {
 				// write file

@@ -369,7 +369,7 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
 		if (database.GetVariable("RuleSet", tmp)) {
 			LogInfo("Loading rule set [{}]", tmp.c_str());

-			if (!RuleManager::Instance()->LoadRules(&database, tmp.c_str(), false)) {
+			if (!RuleManager::Instance()->LoadRules(&database, tmp, false)) {
 				LogInfo("Failed to load ruleset [{}], falling back to defaults", tmp.c_str());
 			}
 		}
@@ -59,8 +59,8 @@ public:
 	static void LockWorld() { if (_world_config) _world_config->Locked=true; }
 	static void UnlockWorld() { if (_world_config) _world_config->Locked=false; }

-	static void SetWorldAddress(std::string addr) { if (_world_config) _world_config->WorldAddress=addr; }
-	static void SetLocalAddress(std::string addr) { if (_world_config) _world_config->LocalAddress=addr; }
+	static void SetWorldAddress(const std::string& addr) { if (_world_config) _world_config->WorldAddress=addr; }
+	static void SetLocalAddress(const std::string& addr) { if (_world_config) _world_config->LocalAddress=addr; }

 	void Dump() const;
 };
@@ -64,7 +64,7 @@ void ZSList::ShowUpTime(WorldTCPConnection* con, const char* adminname) {
 }

 void ZSList::Add(ZoneServer* zoneserver) {
-	zone_server_list.push_back(std::unique_ptr<ZoneServer>(zoneserver));
+	zone_server_list.emplace_back(std::unique_ptr<ZoneServer>(zoneserver));
 	zoneserver->SendGroupIDs();
 }

@@ -311,7 +311,7 @@ void ZSList::SendZoneStatus(const char* to, int16 admin, WorldTCPConnection* con
 		strcpy(locked, "No");
 	}

-	std::vector<char> out;
+	auto out = fmt::memory_buffer();

 	if (connection->IsConsole()) {
 		fmt::format_to(std::back_inserter(out), "World Locked: {}\r\n", locked);
--- a/Show More
+++ b/Show More