Decompress wont default to false

Force add stream_parser.sln
Binary dumping; not yet implemented
2026-05-28 09:45:45 +00:00 · 2024-10-18 17:32:55 -07:00 · 2024-10-18 17:23:12 -07:00 · 2024-10-18 15:49:49 -07:00 · 2024-10-17 22:53:33 -07:00 · 2024-10-17 20:12:33 -07:00
144 changed files with 3368 additions and 3455 deletions
@@ -1,222 +1,3 @@
-## [22.61.0] 1/6/2025
-
-### Bots
-
-* Fix AA ranks to account for level ([#4567](https://github.com/EQEmu/Server/pull/4567)) @nytmyr 2024-12-07
-
-### Code
-
-* Convert Event Parses to Single Line ([#4569](https://github.com/EQEmu/Server/pull/4569)) @Kinglykrab 2024-12-12
-* Fix GM Flag Spell Restriction Bypasses ([#4571](https://github.com/EQEmu/Server/pull/4571)) @Kinglykrab 2025-01-06
-* Remove Unused Group Methods ([#4559](https://github.com/EQEmu/Server/pull/4559)) @Kinglykrab 2024-12-12
-
-### Commands
-
-* Add #find bot Subcommand ([#4563](https://github.com/EQEmu/Server/pull/4563)) @Kinglykrab 2024-12-12
-* Add #find ldon_theme Subcommand ([#4564](https://github.com/EQEmu/Server/pull/4564)) @Kinglykrab 2024-12-12
-* Fix #copycharacter ([#4582](https://github.com/EQEmu/Server/pull/4582)) @Akkadius 2025-01-06
-
-### Databuckets
-
-* Improved Reliability and Performance of Databuckets ([#4562](https://github.com/EQEmu/Server/pull/4562)) @Akkadius 2024-12-12
-
-### Feature
-
-* Enable bazaar window 'Find Trader' functionality ([#4560](https://github.com/EQEmu/Server/pull/4560)) @neckkola 2024-12-12
-
-### Filesystem
-
-* Path Manager Improvements ([#4557](https://github.com/EQEmu/Server/pull/4557)) @Akkadius 2025-01-06
-
-### Fixes
-
-* Allow Items in ROF2 to Stack to 32,767 ([#4556](https://github.com/EQEmu/Server/pull/4556)) @Kinglykrab 2024-12-12
-* Fix EVENT_COMBAT on NPC Death ([#4558](https://github.com/EQEmu/Server/pull/4558)) @Kinglykrab 2024-11-28
-* Guild Membership Update Fix ([#4581](https://github.com/EQEmu/Server/pull/4581)) @neckkola 2025-01-06
-* Guild creation to propagate across zones ([#4575](https://github.com/EQEmu/Server/pull/4575)) @neckkola 2025-01-06
-* Repair a EQEMUConfig Memory Leak ([#4584](https://github.com/EQEmu/Server/pull/4584)) @neckkola 2025-01-06
-* Repair a LoadNPCEmote MemoryLeak ([#4586](https://github.com/EQEmu/Server/pull/4586)) @neckkola 2025-01-06
-* Repair a memory leak in GuildsList ([#4585](https://github.com/EQEmu/Server/pull/4585)) @neckkola 2025-01-06
-* Resolve a client crash when logging in or zoning ([#4572](https://github.com/EQEmu/Server/pull/4572)) @neckkola 2024-12-14
-
-### Groups
-
-* Fix AmIMainAssist incorrectly checking for MainTankName ([#4565](https://github.com/EQEmu/Server/pull/4565)) @nytmyr 2024-12-04
-
-### Inventory
-
-* Add GetInventorySlots() Method ([#4566](https://github.com/EQEmu/Server/pull/4566)) @Kinglykrab 2025-01-06
-
-### Logs
-
-* Improve Crash log defaults ([#4579](https://github.com/EQEmu/Server/pull/4579)) @Akkadius 2025-01-06
-
-### Maps
-
-* Fix broken Map MMFS implementation ([#4576](https://github.com/EQEmu/Server/pull/4576)) @Akkadius 2025-01-06
-
-### Network
-
-* Prune / disconnect TCP connections gracefully ([#4574](https://github.com/EQEmu/Server/pull/4574)) @Akkadius 2025-01-06
-
-### Rules
-
-* Add rules for requiring custom files from client ([#4561](https://github.com/EQEmu/Server/pull/4561)) @knervous 2024-12-12
-
-## [22.60.0] 11/25/2024
-
-### Bazaar
-
-* Further refinements for instanced bazaar ([#4544](https://github.com/EQEmu/Server/pull/4544)) @neckkola 2024-11-16
-
-### Code
-
-* Fix build with older C++ libraries ([#4549](https://github.com/EQEmu/Server/pull/4549)) @hgtw 2024-11-24
-
-### Config
-
-* Fix World TCP Address Configuration Default ([#4551](https://github.com/EQEmu/Server/pull/4551)) @Akkadius 2024-11-24
-
-### Fixes
-
-* Fix Issue with Perl EVENT_PAYLOAD ([#4545](https://github.com/EQEmu/Server/pull/4545)) @Kinglykrab 2024-11-24
-* Fix Possible Item Loss in Trades ([#4554](https://github.com/EQEmu/Server/pull/4554)) @Kinglykrab 2024-11-24
-* Fix Strings::Commify bug with #mystats ([#4547](https://github.com/EQEmu/Server/pull/4547)) @carolus21rex 2024-11-22
-* Fix an edge case with augmented items inside parceled containers ([#4546](https://github.com/EQEmu/Server/pull/4546)) @neckkola 2024-11-21
-* Fix for bazaar search of containers. ([#4540](https://github.com/EQEmu/Server/pull/4540)) @neckkola 2024-11-15
-* Fix for mult-instanced bazaar zones ([#4541](https://github.com/EQEmu/Server/pull/4541)) @neckkola 2024-11-15
-* Fix for sending money via Parcel, then changing your mind ([#4552](https://github.com/EQEmu/Server/pull/4552)) @neckkola 2024-11-24
-* Fix issue where NPC's are being hidden as traders ([#4539](https://github.com/EQEmu/Server/pull/4539)) @Akkadius 2024-11-15
-* Players could become flagged as a Trader when they were not trading ([#4553](https://github.com/EQEmu/Server/pull/4553)) @neckkola 2024-11-24
-
-### Rules
-
-* Add Rule to Disable NPCs Facing Target ([#4543](https://github.com/EQEmu/Server/pull/4543)) @Kinglykrab 2024-11-24
-
-### Tasks
-
-* Update tasks in all zones if invalid zone set ([#4550](https://github.com/EQEmu/Server/pull/4550)) @hgtw 2024-11-25
-
-## [22.59.1] 11/13/2024
-
-### Hotfix
-
-* Fix faulty database migration condition with databuckets (9285)
-
-## [22.59.0] 11/13/2024
-
-### Databuckets
-
-* Add database index to data_buckets ([#4535](https://github.com/EQEmu/Server/pull/4535)) @Akkadius 2024-11-09
-
-### Fixes
-
-* Bazaar two edge case issues resolved ([#4533](https://github.com/EQEmu/Server/pull/4533)) @neckkola 2024-11-09
-* Check if the mob is already in the close mobs list before inserting  @Akkadius 2024-11-11
-* ScanCloseMobs - Ensure scanning mob has an entity ID  @Akkadius 2024-11-10
-
-### Performance
-
-* Improvements to ScanCloseMobs logic ([#4534](https://github.com/EQEmu/Server/pull/4534)) @Akkadius 2024-11-08
-
-### Quest API
-
-* Add Native Database Querying Interface ([#4531](https://github.com/EQEmu/Server/pull/4531)) @hgtw 2024-11-13
-
-### Rules
-
-* Add Rule for restricting client versions to world server ([#4527](https://github.com/EQEmu/Server/pull/4527)) @knervous 2024-11-12
-
-## [22.58.0] 11/5/2024
-
-### Code
-
-* Add mysql prepared statement support ([#4530](https://github.com/EQEmu/Server/pull/4530)) @hgtw 2024-11-06
-* Update perlbind to 1.1.0 ([#4529](https://github.com/EQEmu/Server/pull/4529)) @hgtw 2024-11-06
-
-### Feature
-
-* Focus Skill Attack Spells ([#4528](https://github.com/EQEmu/Server/pull/4528)) @mmcgarvey 2024-10-31
-
-### Fixes
-
-* Add Missing Lua Registers ([#4525](https://github.com/EQEmu/Server/pull/4525)) @Kinglykrab 2024-10-24
-* Fix cross_zone_set_entity_variable_by_char_id in Lua ([#4526](https://github.com/EQEmu/Server/pull/4526)) @Kinglykrab 2024-10-24
-
-### Loginserver
-
-* Automatifc Opcode File Creation ([#4521](https://github.com/EQEmu/Server/pull/4521)) @KimLS 2024-10-22
-
-### Quest API
-
-* Add Spawn Circle/Grid Methods to Perl/Lua ([#4524](https://github.com/EQEmu/Server/pull/4524)) @Kinglykrab 2024-10-24
-
-## [22.57.1] 10/22/2024
-
-### Bots
-
-* Enable Bot Commands Only if Rule Enabled ([#4519](https://github.com/EQEmu/Server/pull/4519)) @Kinglykrab 2024-10-22
-* Fix pet buffs from saving duplicates every save ([#4520](https://github.com/EQEmu/Server/pull/4520)) @nytmyr 2024-10-22
-
-### Loginserver
-
-* Automatic Opcode File Creation ([#4521](https://github.com/EQEmu/Server/pull/4521)) @KimLS 2024-10-22
-
-## [22.57.0] 10/20/2024
-
-### Bots
-
-* Add "silent" option to ^spawn and mute raid spawn ([#4494](https://github.com/EQEmu/Server/pull/4494)) @nytmyr 2024-10-05
-* Add attack flag when told to attack ([#4490](https://github.com/EQEmu/Server/pull/4490)) @nytmyr 2024-09-29
-* Fix timers loading on spawn and zone ([#4516](https://github.com/EQEmu/Server/pull/4516)) @nytmyr 2024-10-20
-
-### Code
-
-* Fixed a typo in Zoning.cpp ([#4515](https://github.com/EQEmu/Server/pull/4515)) @carolus21rex 2024-10-20
-* Optimization Code Cleanup ([#4489](https://github.com/EQEmu/Server/pull/4489)) @Akkadius 2024-09-30
-* Remove Extra Skill in EQ::skills::GetExtraDamageSkills() ([#4486](https://github.com/EQEmu/Server/pull/4486)) @Kinglykrab 2024-10-03
-
-### Crash
-
-* Fixes a crash when the faction_list db table is empty. ([#4511](https://github.com/EQEmu/Server/pull/4511)) @KimLS 2024-10-14
-
-### Fixes
-
-* Add character_instance_safereturns to tables_to_zero_id ([#4485](https://github.com/EQEmu/Server/pull/4485)) @Morzain 2024-09-26
-* Correctly limit max targets of PBAOE ([#4507](https://github.com/EQEmu/Server/pull/4507)) @catapultam-habeo 2024-10-11
-* FindBestZ selecting false zone floor as bestz - Results in roambox failures ([#4504](https://github.com/EQEmu/Server/pull/4504)) @fryguy503 2024-10-13
-* Fix #set motd Crash ([#4495](https://github.com/EQEmu/Server/pull/4495)) @Kinglykrab 2024-10-05
-* Fix `character_exp_modifiers` Default Values ([#4502](https://github.com/EQEmu/Server/pull/4502)) @Kinglykrab 2024-10-09
-* Fix a display error regarding a few trader/buyer query errors ([#4514](https://github.com/EQEmu/Server/pull/4514)) @neckkola 2024-10-17
-* Fix Group ID 0 in Group::SaveGroupLeaderAA() ([#4487](https://github.com/EQEmu/Server/pull/4487)) @Kinglykrab 2024-10-03
-* Fix Mercenary Encounter Crash ([#4509](https://github.com/EQEmu/Server/pull/4509)) @Kinglykrab 2024-10-12
-* Fix NPC::CanTalk() Crash ([#4499](https://github.com/EQEmu/Server/pull/4499)) @Kinglykrab 2024-10-07
-* Fix Spells:DefaultAOEMaxTargets Default Value ([#4508](https://github.com/EQEmu/Server/pull/4508)) @Kinglykrab 2024-10-12
-* Fix Targeted AOE Max Targets Rule ([#4488](https://github.com/EQEmu/Server/pull/4488)) @Kinglykrab 2024-10-03
-* fixed a bug where it would use npc value instead of faction value in the database. ([#4491](https://github.com/EQEmu/Server/pull/4491)) @regneq 2024-09-29
-* Master of Disguise should apply to illusions casted by others. ([#4506](https://github.com/EQEmu/Server/pull/4506)) @fryguy503 2024-10-11
-* Spells - Self Only (Yellow) cast when non group member is targeted ([#4503](https://github.com/EQEmu/Server/pull/4503)) @fryguy503 2024-10-11
-
-### Loginserver
-
-* Larion loginserver support ([#4492](https://github.com/EQEmu/Server/pull/4492)) @KimLS 2024-10-03
-* Login Fatal Error Spamming ([#4476](https://github.com/EQEmu/Server/pull/4476)) @KimLS 2024-10-09
-
-### Logs
-
-* Add NPC Trades to Player Events ([#4505](https://github.com/EQEmu/Server/pull/4505)) @Kinglykrab 2024-10-13
-
-### Quest API
-
-* Add Buff Fade Methods to Perl/Lua ([#4501](https://github.com/EQEmu/Server/pull/4501)) @Kinglykrab 2024-10-09
-* Add EVENT_READ_ITEM to Perl/Lua ([#4497](https://github.com/EQEmu/Server/pull/4497)) @Kinglykrab 2024-10-08
-* Add NPC List Filter Methods to Perl/Lua ([#4493](https://github.com/EQEmu/Server/pull/4493)) @Kinglykrab 2024-10-04
-* Add Scripting Support to Mercenaries ([#4500](https://github.com/EQEmu/Server/pull/4500)) @Kinglykrab 2024-10-11
-
-### Rules
-
-* Add Rule to disable PVP Regions ([#4513](https://github.com/EQEmu/Server/pull/4513)) @Kinglykrab 2024-10-17
-
 ## [22.56.3] 9/23/2024

 ### Fixes
@@ -37,9 +37,6 @@ IF(EQEMU_ADD_PROFILER)
 	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
 ENDIF(EQEMU_ADD_PROFILER)

-IF(USE_MAP_MMFS)
-	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
-ENDIF (USE_MAP_MMFS)

 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
@@ -62,7 +62,6 @@ SET(common_sources
    mutex.cpp
    mysql_request_result.cpp
    mysql_request_row.cpp
-    mysql_stmt.cpp
    opcode_map.cpp
    opcodemgr.cpp
    packet_dump.cpp
@@ -587,7 +586,6 @@ SET(common_headers
    mutex.h
    mysql_request_result.h
    mysql_request_row.h
-    mysql_stmt.h
    op_codes.h
    opcode_dispatch.h
    opcodemgr.h
@@ -8,14 +8,13 @@ std::vector<BazaarSearchResultsFromDB_Struct>
 Bazaar::GetSearchResults(
 	SharedDatabase &db,
 	BazaarSearchCriteria_Struct search,
-	uint32 char_zone_id,
-	int32 char_zone_instance_id
+	uint32 char_zone_id
 )
 {
 	LogTrading(
 		"Searching for items with search criteria - item_name [{}] min_cost [{}] max_cost [{}] min_level [{}] "
 		"max_level [{}] max_results [{}] prestige [{}] augment [{}] trader_entity_id [{}] trader_id [{}] "
-		"search_scope [{}] char_zone_id [{}], char_zone_instance_id [{}]",
+		"search_scope [{}] char_zone_id [{}]",
 		search.item_name,
 		search.min_cost,
 		search.max_cost,
@@ -27,8 +26,7 @@ Bazaar::GetSearchResults(
 		search.trader_entity_id,
 		search.trader_id,
 		search.search_scope,
-		char_zone_id,
-		char_zone_instance_id
+		char_zone_id
 	);

 	std::string search_criteria_trader("TRUE ");
@@ -36,19 +34,14 @@ Bazaar::GetSearchResults(
 	if (search.search_scope == NonRoFBazaarSearchScope) {
 		search_criteria_trader.append(
 			fmt::format(
-				" AND trader.char_entity_id = {} AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
+				" AND trader.char_entity_id = {} AND trader.char_zone_id = {}",
 				search.trader_entity_id,
-				Zones::BAZAAR,
-				char_zone_instance_id
+				Zones::BAZAAR
 			)
 		);
 	}
 	else if (search.search_scope == Local_Scope) {
-		search_criteria_trader.append(fmt::format(
-			" AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
-			char_zone_id,
-			char_zone_instance_id)
-		);
+		search_criteria_trader.append(fmt::format(" AND trader.char_zone_id = {}", char_zone_id));
 	}
 	else if (search.trader_id > 0) {
 		search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
@@ -69,7 +62,7 @@ Bazaar::GetSearchResults(
 	std::string query = fmt::format(
 		"SELECT COUNT(item_id), trader.char_id, trader.item_id, trader.item_sn, trader.item_charges, trader.item_cost, "
 		"trader.slot_id, SUM(trader.item_charges), trader.char_zone_id, trader.char_entity_id, character_data.name, "
-		"aug_slot_1, aug_slot_2, aug_slot_3, aug_slot_4, aug_slot_5, aug_slot_6, trader.char_zone_instance_id "
+		"aug_slot_1, aug_slot_2, aug_slot_3, aug_slot_4, aug_slot_5, aug_slot_6 "
 		"FROM trader, character_data "
 		"WHERE {} AND trader.char_id = character_data.id "
 		"GROUP BY trader.item_sn, trader.item_charges, trader.char_id",
@@ -129,20 +122,19 @@ Bazaar::GetSearchResults(
 			continue;
 		}

-		r.count                   = Strings::ToInt(row[0]);
-		r.trader_id               = Strings::ToInt(row[1]);
-		r.serial_number           = Strings::ToInt(row[3]);
-		r.cost                    = Strings::ToInt(row[5]);
-		r.slot_id                 = Strings::ToInt(row[6]);
-		r.sum_charges             = Strings::ToInt(row[7]);
-		r.stackable               = item->Stackable;
-		r.icon_id                 = item->Icon;
-		r.trader_zone_id          = Strings::ToInt(row[8]);
-		r.trader_zone_instance_id = Strings::ToInt(row[17]);
-		r.trader_entity_id        = Strings::ToInt(row[9]);
-		r.serial_number_RoF       = fmt::format("{:016}\0", Strings::ToInt(row[3]));
-		r.item_name               = fmt::format("{:.63}\0", item->Name);
-		r.trader_name             = fmt::format("{:.63}\0", std::string(row[10]).c_str());
+		r.count             = Strings::ToInt(row[0]);
+		r.trader_id         = Strings::ToInt(row[1]);
+		r.serial_number     = Strings::ToInt(row[3]);
+		r.cost              = Strings::ToInt(row[5]);
+		r.slot_id           = Strings::ToInt(row[6]);
+		r.sum_charges       = Strings::ToInt(row[7]);
+		r.stackable         = item->Stackable;
+		r.icon_id           = item->Icon;
+		r.trader_zone_id    = Strings::ToInt(row[8]);
+		r.trader_entity_id  = Strings::ToInt(row[9]);
+		r.serial_number_RoF = fmt::format("{:016}\0", Strings::ToInt(row[3]));
+		r.item_name         = fmt::format("{:.63}\0", item->Name);
+		r.trader_name       = fmt::format("{:.63}\0", std::string(row[10]).c_str());

 		LogTradingDetail(
 			"Searching against item [{}] ({}) for trader [{}]",
@@ -243,8 +235,7 @@ Bazaar::GetSearchResults(
 		std::vector<ItemSearchType> item_search_types = {
 			{EQ::item::ItemType::ItemTypeAll,                  true},
 			{EQ::item::ItemType::ItemTypeBook,                 item->ItemClass == EQ::item::ItemType::ItemTypeBook},
-			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer ||
-			                                                   item->IsClassBag()},
+			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer},
 			{EQ::item::ItemType::ItemTypeAllEffects,           item->Scroll.Effect > 0 && item->Scroll.Effect < 65000},
 			{EQ::item::ItemType::ItemTypeUnknown9,             item->Worn.Effect == 998},
 			{EQ::item::ItemType::ItemTypeUnknown10,            item->Worn.Effect >= 1298 && item->Worn.Effect <= 1307},
@@ -7,7 +7,7 @@
 class Bazaar {
 public:
 	static std::vector<BazaarSearchResultsFromDB_Struct>
-	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id);
+	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id);
 };


@@ -294,8 +294,6 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}

-	LogSys.CloseFileLogs();
-
 	exit(1);
 }

@@ -1860,35 +1860,7 @@ bool Database::CopyCharacter(

 	const int64 new_character_id = (CharacterDataRepository::GetMaxId(*this) + 1);

-	// validate destination name doesn't exist already
-	const auto& destination_characters = CharacterDataRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`name` = '{}' AND `deleted_at` IS NULL LIMIT 1",
-			Strings::Escape(destination_character_name)
-		)
-	);
-	if (!destination_characters.empty()) {
-		LogError("Character [{}] already exists", destination_character_name);
-		return false;
-	}
-
-	std::vector<std::string> tables_to_zero_id = {
-		"keyring",
-		"data_buckets",
-		"character_instance_safereturns",
-		"character_expedition_lockouts",
-		"character_instance_lockouts",
-		"character_parcels",
-		"character_tribute",
-		"player_titlesets",
-	};
-
-	std::vector<std::string> ignore_tables = {
-		"guilds",
-	};
-
-	size_t total_rows_copied = 0;
+	std::vector<std::string> tables_to_zero_id = { "keyring", "data_buckets", "character_instance_safereturns" };

 	TransactionBegin();

@@ -1896,10 +1868,6 @@ bool Database::CopyCharacter(
 		const std::string& table_name               = t.first;
 		const std::string& character_id_column_name = t.second;

-		if (Strings::Contains(ignore_tables, table_name)) {
-			continue;
-		}
-
 		auto results = QueryDatabase(
 			fmt::format(
 				"SHOW COLUMNS FROM {}",
@@ -1950,10 +1918,6 @@ bool Database::CopyCharacter(
 					value = std::to_string(destination_account_id);
 				}

-				if (!Strings::IsNumber(value)) {
-					value = Strings::Escape(value);
-				}
-
 				new_values.emplace_back(value);
 			}

@@ -1986,11 +1950,6 @@ bool Database::CopyCharacter(
 				)
 			);

-			size_t rows_copied = insert_rows.size(); // Rows copied for this table
-			total_rows_copied += rows_copied; // Increment grand total
-
-			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
-
 			if (!insert.ErrorMessage().empty()) {
 				TransactionRollback();
 				return false;
@@ -2000,13 +1959,6 @@ bool Database::CopyCharacter(

 	TransactionCommit();

-	LogInfo(
-		"Character [{}] copied to [{}] total rows [{}]",
-		source_character_name,
-		destination_character_name,
-		Strings::Commify(total_rows_copied)
-	);
-
 	return true;
 }

@@ -5758,29 +5758,6 @@ ALTER TABLE `inventory_snapshots`
 ALTER TABLE `character_exp_modifiers`
 MODIFY COLUMN `aa_modifier` float NOT NULL DEFAULT 1.0 AFTER `instance_version`,
 MODIFY COLUMN `exp_modifier` float NOT NULL DEFAULT 1.0 AFTER `aa_modifier`;
-)"
-	},
-	ManifestEntry{
-		.version = 9285,
-		.description = "2024_11_08_data_buckets_indexes.sql",
-		.check = "SHOW CREATE TABLE `data_buckets`",
-		.condition = "missing",
-		.match = "idx_character_expires",
-		.sql = R"(
-CREATE INDEX idx_character_expires ON data_buckets (character_id, expires);
-CREATE INDEX idx_npc_expires ON data_buckets (npc_id, expires);
-CREATE INDEX idx_bot_expires ON data_buckets (bot_id, expires);
-)"
-	},
-	ManifestEntry{
-		.version = 9286,
-		.description = "2024_11_26_bazaar_find_trader.sql",
-		.check       = "SHOW COLUMNS FROM `trader` LIKE 'char_zone_instance_id'",
-		.condition   = "empty",
-		.match       = "",
-		.sql         = R"(
-ALTER TABLE `trader`
-	ADD COLUMN `char_zone_instance_id` INT NULL DEFAULT '0' AFTER `char_zone_id`;
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry
@@ -7,7 +7,6 @@
 #include "timer.h"

 #include "dbcore.h"
-#include "mysql_stmt.h"

 #include <fstream>
 #include <iostream>
@@ -437,8 +436,3 @@ MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)

 	return r;
 }
-
-mysql::PreparedStmt DBcore::Prepare(std::string query)
-{
-	return mysql::PreparedStmt(*mysql, std::move(query), m_mutex);
-}
@@ -17,8 +17,6 @@
 #define CR_SERVER_GONE_ERROR    2006
 #define CR_SERVER_LOST          2013

-namespace mysql { class PreparedStmt; }
-
 class DBcore {
 public:
 	enum eStatus {
@@ -50,11 +48,6 @@ public:
 	}
 	void SetMutex(Mutex *mutex);

-	// only safe on connections shared with other threads if results buffered
-	// unsafe to use off main thread due to internal server logging
-	// throws std::runtime_error on failure
-	mysql::PreparedStmt Prepare(std::string query);
-
 protected:
 	bool Open(
 		const char *iHost,
@@ -140,6 +140,29 @@ std::string EQ::constants::GetLanguageName(uint8 language_id)
 	return EQ::constants::GetLanguageMap().find(language_id)->second;
 }

+const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
+{
+	static const std::map<uint32, std::string> ldon_theme_map = {
+		{ LDoNThemes::Unused, "Unused" },
+		{ LDoNThemes::GUK, "Deepest Guk" },
+		{ LDoNThemes::MIR, "Miragul's Menagerie" },
+		{ LDoNThemes::MMC, "Mistmoore Catacombs" },
+		{ LDoNThemes::RUJ, "Rujarkian Hills" },
+		{ LDoNThemes::TAK, "Takish-Hiz" },
+	};
+
+	return ldon_theme_map;
+}
+
+std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
+{
+	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return std::string();
+	}
+
+	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+}
+
 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
 {
 	static const std::map<int8, std::string> flymode_map = {
@@ -436,18 +459,3 @@ bool ComparisonType::IsValid(uint8 type)
 {
 	return comparison_types.find(type) != comparison_types.end();
 }
-
-uint32 LDoNTheme::GetBitmask(uint32 theme_id)
-{
-	return IsValid(theme_id) ? ldon_theme_names[theme_id].second : LDoNTheme::UnusedBit;
-}
-
-std::string LDoNTheme::GetName(uint32 theme_id)
-{
-	return IsValid(theme_id) ? ldon_theme_names[theme_id].first : "UNKNOWN LDON THEME";
-}
-
-bool LDoNTheme::IsValid(uint32 theme_id)
-{
-	return ldon_theme_names.find(theme_id) != ldon_theme_names.end();
-}
@@ -352,6 +352,9 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetLanguageMap();
 		std::string GetLanguageName(uint8 language_id);

+		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
+		std::string GetLDoNThemeName(uint32 theme_id);
+
 		extern const std::map<int8, std::string>& GetFlyModeMap();
 		std::string GetFlyModeName(int8 flymode_id);

@@ -748,35 +751,6 @@ static std::map<uint32, std::string> stance_names = {
 	{ Stance::AEBurn,     "AE Burn" }
 };

-namespace LDoNTheme {
-	constexpr uint32 Unused = 0;
-	constexpr uint32 GUK    = 1;
-	constexpr uint32 MIR    = 2;
-	constexpr uint32 MMC    = 3;
-	constexpr uint32 RUJ    = 4;
-	constexpr uint32 TAK    = 5;
-
-	constexpr uint32 UnusedBit = 0;
-	constexpr uint32 GUKBit    = 1;
-	constexpr uint32 MIRBit    = 2;
-	constexpr uint32 MMCBit    = 4;
-	constexpr uint32 RUJBit    = 8;
-	constexpr uint32 TAKBit    = 16;
-
-	uint32 GetBitmask(uint32 theme_id);
-	std::string GetName(uint32 theme_id);
-	bool IsValid(uint32 theme_id);
-}
-
-static std::map<uint32, std::pair<std::string, uint32>> ldon_theme_names = {
-	{ LDoNTheme::Unused, { "Unused",              LDoNTheme::UnusedBit }, },
-	{ LDoNTheme::GUK,    { "Deepest Guk",         LDoNTheme::GUKBit }, },
-	{ LDoNTheme::MIR,    { "Miragul's Menagerie", LDoNTheme::MIRBit }, },
-	{ LDoNTheme::MMC,    { "Mistmoore Catacombs", LDoNTheme::MMCBit }, },
-	{ LDoNTheme::RUJ,    { "Rujarkian Hills",     LDoNTheme::RUJBit }, },
-	{ LDoNTheme::TAK,    { "Takish-Hiz",          LDoNTheme::TAKBit }, },
-};
-
 namespace PCNPCOnlyFlagType {
 	constexpr int PC  = 1;
 	constexpr int NPC = 2;
@@ -993,6 +993,24 @@ enum class DynamicZoneMemberStatus : uint8_t
 	LinkDead
 };

+enum LDoNThemes {
+	Unused = 0,
+	GUK,
+	MIR,
+	MMC,
+	RUJ,
+	TAK
+};
+
+enum LDoNThemeBits {
+	UnusedBit = 0,
+	GUKBit = 1,
+	MIRBit = 2,
+	MMCBit = 4,
+	RUJBit = 8,
+	TAKBit = 16
+};
+
 enum StartZoneIndex {
    Odus = 0,
    Qeynos,
@@ -3221,7 +3221,6 @@ struct BuyerMessaging_Struct {
 	char   item_name[64];
 	uint32 slot;
 	uint32 seller_quantity;
-	uint32 purchase_method; // 0 direct merchant, 1 via /barter window
 };

 struct BuyerAddBuyertoBarterWindow_Struct {
@@ -3742,8 +3741,7 @@ struct GetItems_Struct{

 struct BecomeTrader_Struct {
 	uint32 action;
-	uint16 zone_id;
-	uint16 zone_instance_id;
+	uint32 zone_id;
 	uint32 trader_id;
 	uint32 entity_id;
 	char   trader_name[64];
@@ -6348,7 +6346,6 @@ enum BazaarTraderBarterActions {
 	TraderAck2                   = 22,
 	AddTraderToBazaarWindow      = 24,
 	RemoveTraderFromBazaarWindow = 25,
-	FirstOpenSearch              = 26,
 	ClickTrader                  = 28,
 	DeliveryCostUpdate           = 29
 };
@@ -6388,7 +6385,6 @@ struct BazaarSearchResultsFromDB_Struct {
 	uint32      icon_id;
 	uint32      sum_charges;
 	uint32      trader_zone_id;
-	int32       trader_zone_instance_id;
 	uint32      trader_entity_id;
 	uint32      item_stat;
 	bool        stackable;
@@ -6410,7 +6406,6 @@ struct BazaarSearchResultsFromDB_Struct {
 			CEREAL_NVP(icon_id),
 			CEREAL_NVP(sum_charges),
 			CEREAL_NVP(trader_zone_id),
-			CEREAL_NVP(trader_zone_instance_id),
 			CEREAL_NVP(trader_entity_id),
 			CEREAL_NVP(item_stat),
 			CEREAL_NVP(stackable),
@@ -94,7 +94,7 @@ void EQEmuConfig::parse_config()
 		auto_database_updates = true;
 	}

-	WorldIP      = _root["server"]["world"]["tcp"].get("ip", "127.0.0.1").asString();
+	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
 	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());

 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
@@ -171,7 +171,6 @@ void EQEmuConfig::parse_config()
 	PluginDir    = _root["server"]["directories"].get("plugins", "plugins/").asString();
 	LuaModuleDir = _root["server"]["directories"].get("lua_modules", "lua_modules/").asString();
 	PatchDir     = _root["server"]["directories"].get("patches", "./").asString();
-	OpcodeDir    = _root["server"]["directories"].get("opcodes", "./").asString();
 	SharedMemDir = _root["server"]["directories"].get("shared_memory", "shared/").asString();
 	LogDir       = _root["server"]["directories"].get("logs", "logs/").asString();

@@ -95,7 +95,6 @@ class EQEmuConfig
 		std::string PluginDir;
 		std::string LuaModuleDir;
 		std::string PatchDir;
-		std::string OpcodeDir;
 		std::string SharedMemDir;
 		std::string LogDir;

@@ -137,9 +136,9 @@ class EQEmuConfig
 		{

 		}
+		virtual ~EQEmuConfig() {}

 	public:
-		virtual ~EQEmuConfig() {}

 		// Produce a const singleton
 		static const EQEmuConfig *get()
@@ -25,8 +25,6 @@
 #include "repositories/discord_webhooks_repository.h"
 #include "repositories/logsys_categories_repository.h"
 #include "termcolor/rang.hpp"
-#include "path_manager.h"
-#include "file.h"

 #include <iostream>
 #include <string>
@@ -87,7 +85,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	 * Set Defaults
 	 */
 	log_settings[Logs::Crash].log_to_console                = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Crash].log_to_file                   = static_cast<uint8>(Logs::General);
 	log_settings[Logs::MySQLError].log_to_console           = static_cast<uint8>(Logs::General);
 	log_settings[Logs::NPCScaling].log_to_gmsay             = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay              = static_cast<uint8>(Logs::General);
@@ -535,11 +532,6 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
 	EQEmuLogSys::CloseFileLogs();

-	if (!File::Exists(path.GetLogPath())) {
-		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
-		File::Makedir(path.GetLogPath());
-	}
-
 	/**
 	 * When loading settings, we must have been given a reason in category based logging to output to a file in order to even create or open one...
 	 */
@@ -612,9 +612,9 @@ bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
 	return has_equipped;
 }

-uint32 EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
+int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
 {
-	uint32 quantity = 0;
+	int quantity = 0;
 	ItemInstance* item = nullptr;

 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -643,9 +643,9 @@ bool EQ::InventoryProfile::HasItemEquippedByID(uint32 item_id)
 	return has_equipped;
 }

-uint32 EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
+int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
 {
-	uint32 quantity = 0;
+	int quantity = 0;
 	ItemInstance* item = nullptr;

 	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
@@ -1807,4 +1807,4 @@ int16 EQ::InventoryProfile::FindFirstFreeSlotThatFitsItem(const EQ::ItemData *it
 		}
 	}
 	return 0;
-}
+}
@@ -147,13 +147,13 @@ namespace EQ
 		bool HasItemEquippedByID(uint32 item_id);

 		// Check how many of a specific item the player has equipped by Item ID
-		uint32 CountItemEquippedByID(uint32 item_id);
+		int CountItemEquippedByID(uint32 item_id);

 		// Check if player has a specific augment equipped by Item ID
 		bool HasAugmentEquippedByID(uint32 item_id);

 		// Check how many of a specific augment the player has equipped by Item ID
-		uint32 CountAugmentEquippedByID(uint32 item_id);
+		int CountAugmentEquippedByID(uint32 item_id);

 		// Get a list of augments from a specific slot ID
 		std::vector<uint32> GetAugmentIDsBySlotID(int16 slot_id);
@@ -1,600 +0,0 @@
-#include "mysql_stmt.h"
-#include "eqemu_logsys.h"
-#include "mutex.h"
-#include "timer.h"
-#include <charconv>
-
-namespace mysql
-{
-
-void PreparedStmt::StmtDeleter::operator()(MYSQL_STMT* stmt) noexcept
-{
-	// The connection must be locked when closing the stmt to avoid mysql errors
-	// in case another thread tries to use it during the close. If the mutex is
-	// changed to one that throws then exceptions need to be caught here.
-	LockMutex lock(mutex);
-	mysql_stmt_close(stmt);
-}
-
-PreparedStmt::PreparedStmt(MYSQL& mysql, std::string query, Mutex* mutex, StmtOptions opts)
-	: m_stmt(mysql_stmt_init(&mysql), { mutex }), m_query(std::move(query)), m_mutex(mutex), m_options(opts)
-{
-	LockMutex lock(m_mutex);
-	if (mysql_stmt_prepare(m_stmt.get(), m_query.c_str(), static_cast<unsigned long>(m_query.size())) != 0)
-	{
-		ThrowError(fmt::format("Prepare error: {}", GetStmtError()));
-	}
-
-	m_params.resize(mysql_stmt_param_count(m_stmt.get()));
-	m_inputs.resize(m_params.size());
-}
-
-void PreparedStmt::ThrowError(const std::string& error)
-{
-	LogMySQLError("{}", error);
-	throw std::runtime_error(error);
-}
-
-std::string PreparedStmt::GetStmtError()
-{
-	auto err = mysql_stmt_errno(m_stmt.get());
-	auto str = mysql_stmt_error(m_stmt.get());
-	return fmt::format("({}) [{}] for query [{}]", err, str, m_query);
-}
-
-template <typename T>
-void PreparedStmt::BindInput(size_t index, T value)
-{
-	if (index >= m_inputs.size())
-	{
-		ThrowError(fmt::format("Cannot bind input, index {} out of range", index));
-	}
-
-	impl::Bind& arg  = m_inputs[index];
-	arg.is_null      = std::is_same_v<T, std::nullptr_t>;
-
-	MYSQL_BIND& bind = m_params[index];
-	bind.is_unsigned = std::is_unsigned_v<T>;
-	bind.is_null     = &arg.is_null;
-	bind.length      = &arg.length;
-
-	auto old_type = bind.buffer_type;
-
-	if constexpr (std::is_arithmetic_v<T>)
-	{
-		if (arg.buffer.size() < sizeof(T))
-		{
-			arg.buffer.resize(std::max(sizeof(T), sizeof(int64_t)));
-			bind.buffer = arg.buffer.data();
-			m_need_bind = true;
-		}
-		memcpy(arg.buffer.data(), &value, sizeof(T));
-	}
-
-	if constexpr (std::is_same_v<T, int8_t> || std::is_same_v<T, uint8_t> || std::is_same_v<T, bool>)
-	{
-		bind.buffer_type = MYSQL_TYPE_TINY;
-	}
-	else if constexpr (std::is_same_v<T, int16_t> || std::is_same_v<T, uint16_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_SHORT;
-	}
-	else if constexpr (std::is_same_v<T, int32_t> || std::is_same_v<T, uint32_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_LONG;
-	}
-	else if constexpr (std::is_same_v<T, int64_t> || std::is_same_v<T, uint64_t>)
-	{
-		bind.buffer_type = MYSQL_TYPE_LONGLONG;
-	}
-	else if constexpr (std::is_same_v<T, float>)
-	{
-		bind.buffer_type = MYSQL_TYPE_FLOAT;
-	}
-	else if constexpr (std::is_same_v<T, double>)
-	{
-		bind.buffer_type = MYSQL_TYPE_DOUBLE;
-	}
-	else if constexpr (std::is_same_v<T, std::string_view>)
-	{
-		bind.buffer_type = MYSQL_TYPE_STRING;
-		if (arg.buffer.empty() || arg.buffer.size() < value.size())
-		{
-			arg.buffer.resize(static_cast<size_t>((value.size() + 1) * 1.5));
-			bind.buffer = arg.buffer.data();
-			bind.buffer_length = static_cast<unsigned long>(arg.buffer.size());
-			m_need_bind = true;
-		}
-		std::copy(value.begin(), value.end(), arg.buffer.begin());
-		arg.length = static_cast<unsigned long>(value.size());
-	}
-	else if constexpr (!std::is_same_v<T, std::nullptr_t>)
-	{
-		static_assert(false_v<T>, "Cannot bind unsupported type");
-	}
-
-	if (old_type != bind.buffer_type)
-	{
-		m_need_bind = true;
-	}
-}
-
-void PreparedStmt::BindInput(size_t index, const char* str)
-{
-	BindInput(index, std::string_view(str));
-}
-
-void PreparedStmt::BindInput(size_t index, const std::string& str)
-{
-	BindInput(index, std::string_view(str));
-}
-
-StmtResult PreparedStmt::Execute()
-{
-	CheckArgs(0);
-	return DoExecute();
-}
-
-StmtResult PreparedStmt::Execute(const std::vector<param_t>& args)
-{
-	CheckArgs(args.size());
-	for (size_t i = 0; i < args.size(); ++i)
-	{
-		std::visit([&](const auto& arg) { BindInput(i, arg); }, args[i]);
-	}
-	return DoExecute();
-}
-
-template <typename T>
-StmtResult PreparedStmt::Execute(const std::vector<T>& args)
-{
-	CheckArgs(args.size());
-	for (size_t i = 0; i < args.size(); ++i)
-	{
-		BindInput(i, args[i]);
-	}
-	return DoExecute();
-}
-
-void PreparedStmt::CheckArgs(size_t argc)
-{
-	if (argc != m_params.size())
-	{
-		ThrowError(fmt::format("Bad arg count (got {}, expected {}) for [{}]", argc, m_params.size(), m_query));
-	}
-}
-
-StmtResult PreparedStmt::DoExecute()
-{
-	BenchTimer timer;
-	LockMutex lock(m_mutex);
-
-	if (m_need_bind && mysql_stmt_bind_param(m_stmt.get(), m_params.data()) != 0)
-	{
-		ThrowError(fmt::format("Bind param error: {}", GetStmtError()));
-	}
-
-	m_need_bind = false;
-
-	if (mysql_stmt_execute(m_stmt.get()) != 0)
-	{
-		ThrowError(fmt::format("Execute error: {}", GetStmtError()));
-	}
-
-	my_bool attr = m_options.use_max_length;
-	mysql_stmt_attr_set(m_stmt.get(), STMT_ATTR_UPDATE_MAX_LENGTH, &attr);
-
-	if (m_options.buffer_results && mysql_stmt_store_result(m_stmt.get()) != 0)
-	{
-		ThrowError(fmt::format("Store result error: {}", GetStmtError()));
-	}
-
-	// Result buffers are bound on first execute and re-used if needed
-	if (m_results.empty())
-	{
-		BindResults();
-	}
-
-	StmtResult res(m_stmt.get(), m_results.size());
-
-	if (m_results.empty())
-	{
-		LogMySQLQuery("{} -- ({} row(s) affected) ({:.6f}s)", m_query, res.RowsAffected(), timer.elapsed());
-	}
-	else
-	{
-		LogMySQLQuery("{} -- ({} row(s) returned) ({:.6f}s)", m_query, res.RowCount(), timer.elapsed());
-	}
-
-	return res;
-}
-
-void PreparedStmt::BindResults()
-{
-	MYSQL_RES* res = mysql_stmt_result_metadata(m_stmt.get());
-	if (!res)
-	{
-		return; // did not produce a result set
-	}
-
-	MYSQL_FIELD* fields = mysql_fetch_fields(res);
-	m_columns.resize(mysql_num_fields(res));
-	m_results.resize(m_columns.size());
-
-	for (int i = 0; i < static_cast<int>(m_columns.size()); ++i)
-	{
-		impl::BindColumn& col = m_columns[i].m_col;
-		MYSQL_BIND& bind = m_results[i];
-
-		col.index          = i;
-		col.name           = fields[i].name;
-		col.buffer_type    = fields[i].type;
-		col.is_unsigned    = (fields[i].flags & UNSIGNED_FLAG) != 0;
-		col.buffer.resize(GetResultBufferSize(fields[i]));
-
-		bind.buffer_type   = col.buffer_type;
-		bind.buffer        = col.buffer.data();
-		bind.buffer_length = static_cast<unsigned long>(col.buffer.size());
-		bind.is_unsigned   = col.is_unsigned;
-		bind.is_null       = &col.is_null;
-		bind.length        = &col.length;
-		bind.error         = &col.error;
-	}
-
-	mysql_free_result(res);
-
-	if (!m_results.empty() && mysql_stmt_bind_result(m_stmt.get(), m_results.data()) != 0)
-	{
-		ThrowError(fmt::format("Bind result error: {}", GetStmtError()));
-	}
-}
-
-int PreparedStmt::GetResultBufferSize(const MYSQL_FIELD& field) const
-{
-	switch (field.type)
-	{
-	case MYSQL_TYPE_TINY:
-		return sizeof(int8_t);
-	case MYSQL_TYPE_SHORT:
-		return sizeof(int16_t);
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return sizeof(int32_t);
-	case MYSQL_TYPE_LONGLONG:
-		return sizeof(int64_t);
-	case MYSQL_TYPE_FLOAT:
-		return sizeof(float);
-	case MYSQL_TYPE_DOUBLE:
-		return sizeof(double);
-	case MYSQL_TYPE_TIME:
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP:
-		return sizeof(MYSQL_TIME);
-	default: // if max_length is unavailable for strings buffers are resized on fetch
-		return field.max_length + 1; // ensure valid buffer created
-	}
-}
-
-StmtRow PreparedStmt::Fetch()
-{
-	StmtRow row;
-	if (!m_columns.empty())
-	{
-		int rc = mysql_stmt_fetch(m_stmt.get());
-		if (rc == 1)
-		{
-			ThrowError(fmt::format("Fetch error: {}", GetStmtError()));
-		}
-
-		if (rc != MYSQL_NO_DATA)
-		{
-			if (rc == MYSQL_DATA_TRUNCATED)
-			{
-				FetchTruncated();
-			}
-			row = StmtRow(m_columns);
-		}
-	}
-	return row;
-}
-
-void PreparedStmt::FetchTruncated()
-{
-	for (int i = 0; i < static_cast<int>(m_columns.size()); ++i)
-	{
-		impl::BindColumn& col = m_columns[i].m_col;
-		if (col.error)
-		{
-			MYSQL_BIND& bind = m_results[i];
-			col.buffer.resize(static_cast<size_t>(col.length * 1.5));
-			bind.buffer = col.buffer.data();
-			bind.buffer_length = static_cast<unsigned long>(col.buffer.size());
-
-			mysql_stmt_fetch_column(m_stmt.get(), &bind, i, 0);
-		}
-	}
-
-	if (mysql_stmt_bind_result(m_stmt.get(), m_results.data()) != 0)
-	{
-		ThrowError(fmt::format("Fetch rebind result error: {}", GetStmtError()));
-	}
-}
-
-// ---------------------------------------------------------------------------
-
-StmtResult::StmtResult(MYSQL_STMT* stmt, size_t columns)
-{
-	m_num_cols  = static_cast<int>(columns);
-	m_num_rows  = mysql_stmt_num_rows(stmt); // requires buffered results
-	m_affected  = mysql_stmt_affected_rows(stmt);
-	m_insert_id = mysql_stmt_insert_id(stmt);
-}
-
-// ---------------------------------------------------------------------------
-
-const StmtColumn* StmtRow::GetColumn(size_t index) const
-{
-	return index < m_columns.size() ? &m_columns[index] : nullptr;
-}
-
-const StmtColumn* StmtRow::GetColumn(std::string_view name) const
-{
-	auto it = std::ranges::find_if(m_columns,
-		[name](const StmtColumn& col) { return col.Name() == name; });
-
-	return it != m_columns.end() ? &(*it) : nullptr;
-}
-
-std::optional<std::string> StmtRow::operator[](size_t index) const
-{
-	return GetStr(index);
-}
-
-std::optional<std::string> StmtRow::operator[](std::string_view name) const
-{
-	return GetStr(name);
-}
-
-std::optional<std::string> StmtRow::GetStr(size_t index) const
-{
-	const StmtColumn* col = GetColumn(index);
-	return col ? col->GetStr() : std::nullopt;
-}
-
-std::optional<std::string> StmtRow::GetStr(std::string_view name) const
-{
-	const StmtColumn* col = GetColumn(name);
-	return col ? col->GetStr() : std::nullopt;
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtRow::Get(size_t index) const
-{
-	const StmtColumn* col = GetColumn(index);
-	return col ? col->Get<T>() : std::nullopt;
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtRow::Get(std::string_view name) const
-{
-	const StmtColumn* col = GetColumn(name);
-	return col ? col->Get<T>() : std::nullopt;
-}
-
-// ---------------------------------------------------------------------------
-
-static time_t MakeTime(const MYSQL_TIME& mt)
-{
-	// buffer mt given in mysql session time zone (assumes local)
-	std::tm tm{};
-	tm.tm_year  = mt.year - 1900;
-	tm.tm_mon   = mt.month - 1;
-	tm.tm_mday  = mt.day;
-	tm.tm_hour  = mt.hour;
-	tm.tm_min   = mt.minute;
-	tm.tm_sec   = mt.second;
-	tm.tm_isdst = -1;
-	return std::mktime(&tm);
-}
-
-static int MakeSeconds(const MYSQL_TIME& mt)
-{
-	return (mt.neg ? -1 : 1) * static_cast<int>(mt.hour * 3600 + mt.minute * 60 + mt.second);
-}
-
-static uint64_t MakeBits(std::span<const uint8_t> data)
-{
-	// byte stream for bits is in big endian
-	uint64_t bits = 0;
-	for (size_t i = 0; i < data.size() && i < sizeof(uint64_t); ++i)
-	{
-		bits |= static_cast<uint64_t>(data[data.size() - i - 1] & 0xff) << (i * 8);
-	}
-	return bits;
-}
-
-template <typename T>
-concept has_from_chars = requires (const char* first, const char* last, T value)
-{
-	std::from_chars(first, last, value);
-};
-
-template <typename T>
-static T FromString(std::string_view sv)
-{
-	if constexpr (std::is_same_v<T, bool>)
-	{
-		// return false for empty (zero-length) strings
-		return !sv.empty();
-	}
-	else if constexpr (std::is_same_v<T, float> && !has_from_chars<T>)
-	{
-		return std::strtof(std::string(sv).c_str(), nullptr);
-	}
-	else if constexpr (std::is_same_v<T, double> && !has_from_chars<T>)
-	{
-		return std::strtod(std::string(sv).c_str(), nullptr);
-	}
-	else
-	{
-		// non numbers return a zero initialized T (could return nullopt instead)
-		T value = {};
-		std::from_chars(sv.data(), sv.data() + sv.size(), value);
-		return value;
-	}
-}
-
-static std::string FormatTime(enum_field_types type, const MYSQL_TIME& mt)
-{
-	switch (type)
-	{
-	case MYSQL_TYPE_TIME: // hhh:mm:ss '-838:59:59' to '838:59:59'
-		return fmt::format("{}{:02d}:{:02d}:{:02d}", mt.neg ? "-" : "", mt.hour, mt.minute, mt.second);
-	case MYSQL_TYPE_DATE: // YYYY-MM-DD '1000-01-01' to '9999-12-31'
-		return fmt::format("{}-{:02d}-{:02d}", mt.year, mt.month, mt.day);
-	case MYSQL_TYPE_DATETIME:  // YYYY-MM-DD hh:mm:ss '1000-01-01 00:00:00' to '9999-12-31 23:59:59'
-	case MYSQL_TYPE_TIMESTAMP: // YYYY-MM-DD hh:mm:ss '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC
-		return fmt::format("{}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}", mt.year, mt.month, mt.day, mt.hour, mt.minute, mt.second);
-	default:
-		return std::string();
-	}
-}
-
-std::optional<std::string_view> StmtColumn::GetStrView() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return std::make_optional<std::string_view>(reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length);
-	default:
-		return std::nullopt;
-	}
-}
-
-std::optional<std::string> StmtColumn::GetStr() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_TINY:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint8_t>()).c_str() : fmt::format_int(BitCast<int8_t>()).c_str();
-	case MYSQL_TYPE_SHORT:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint16_t>()).c_str() : fmt::format_int(BitCast<int16_t>()).c_str();
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint32_t>()).c_str() : fmt::format_int(BitCast<int32_t>()).c_str();
-	case MYSQL_TYPE_LONGLONG:
-		return m_col.is_unsigned ? fmt::format_int(BitCast<uint64_t>()).c_str() : fmt::format_int(BitCast<int64_t>()).c_str();
-	case MYSQL_TYPE_FLOAT:
-		return fmt::format("{}", BitCast<float>());
-	case MYSQL_TYPE_DOUBLE:
-		return fmt::format("{}", BitCast<double>());
-	case MYSQL_TYPE_TIME:
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP:
-		return FormatTime(m_col.buffer_type, BitCast<MYSQL_TIME>());
-	case MYSQL_TYPE_BIT:
-		return fmt::format_int(*Get<uint64_t>()).c_str();
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return std::make_optional<std::string>(reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length);
-	default:
-		return std::nullopt;
-	}
-}
-
-template <typename T> requires std::is_arithmetic_v<T>
-std::optional<T> StmtColumn::Get() const
-{
-	if (m_col.is_null)
-	{
-		return std::nullopt;
-	}
-
-	switch (m_col.buffer_type)
-	{
-	case MYSQL_TYPE_TINY:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint8_t>()) : static_cast<T>(BitCast<int8_t>());
-	case MYSQL_TYPE_SHORT:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint16_t>()) : static_cast<T>(BitCast<int16_t>());
-	case MYSQL_TYPE_INT24:
-	case MYSQL_TYPE_LONG:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint32_t>()) : static_cast<T>(BitCast<int32_t>());
-	case MYSQL_TYPE_LONGLONG:
-		return m_col.is_unsigned ? static_cast<T>(BitCast<uint64_t>()) : static_cast<T>(BitCast<int64_t>());
-	case MYSQL_TYPE_FLOAT:
-		return static_cast<T>(BitCast<float>());
-	case MYSQL_TYPE_DOUBLE:
-		return static_cast<T>(BitCast<double>());
-	case MYSQL_TYPE_TIME: // return as total seconds
-		return static_cast<T>(MakeSeconds(BitCast<MYSQL_TIME>()));
-	case MYSQL_TYPE_DATE:
-	case MYSQL_TYPE_DATETIME:
-	case MYSQL_TYPE_TIMESTAMP: // return as epoch timestamp
-		return static_cast<T>(MakeTime(BitCast<MYSQL_TIME>()));
-	case MYSQL_TYPE_BIT:
-		return static_cast<T>(MakeBits({ m_col.buffer.data(), m_col.length }));
-	case MYSQL_TYPE_NEWDECIMAL:
-	case MYSQL_TYPE_TINY_BLOB:
-	case MYSQL_TYPE_MEDIUM_BLOB:
-	case MYSQL_TYPE_LONG_BLOB:
-	case MYSQL_TYPE_BLOB:
-	case MYSQL_TYPE_VAR_STRING:
-	case MYSQL_TYPE_STRING:
-		return FromString<T>({ reinterpret_cast<const char*>(m_col.buffer.data()), m_col.length });
-	default:
-		return std::nullopt;
-	}
-}
-
-// ---------------------------------------------------------------------------
-
-// explicit template instantiations for supported types
-template void PreparedStmt::BindInput(size_t, std::string_view);
-template void PreparedStmt::BindInput(size_t, std::nullptr_t);
-template StmtResult PreparedStmt::Execute(const std::vector<std::string_view>&);
-template StmtResult PreparedStmt::Execute(const std::vector<std::string>&);
-template StmtResult PreparedStmt::Execute(const std::vector<const char*>&);
-
-#define INSTANTIATE(T) \
-	template void PreparedStmt::BindInput(size_t, T); \
-	template StmtResult PreparedStmt::Execute(const std::vector<T>&); \
-	template std::optional<T> StmtRow::Get(size_t) const; \
-	template std::optional<T> StmtRow::Get(std::string_view) const; \
-	template std::optional<T> StmtColumn::Get() const;
-
-INSTANTIATE(bool);
-INSTANTIATE(int8_t);
-INSTANTIATE(uint8_t);
-INSTANTIATE(int16_t);
-INSTANTIATE(uint16_t);
-INSTANTIATE(int32_t);
-INSTANTIATE(uint32_t);
-INSTANTIATE(int64_t);
-INSTANTIATE(uint64_t);
-INSTANTIATE(float);
-INSTANTIATE(double);
-
-} // namespace mysql
@@ -1,221 +0,0 @@
-#pragma once
-
-#include "mysql.h"
-#include <cassert>
-#include <cstring>
-#include <memory>
-#include <optional>
-#include <span>
-#include <string>
-#include <string_view>
-#include <variant>
-#include <vector>
-
-class Mutex;
-
-namespace mysql
-{
-
-// support MySQL 8.0.1+ API which removed the my_bool type
-#if !defined(MARIADB_VERSION_ID) && MYSQL_VERSION_ID >= 80001
-using my_bool = bool;
-#endif
-
-template <typename>
-inline constexpr bool false_v = false;
-
-namespace impl
-{
-
-struct Bind
-{
-	std::vector<uint8_t> buffer;
-	unsigned long length = 0;
-	my_bool is_null = false;
-	my_bool error = false;
-};
-
-struct BindColumn : Bind
-{
-	int index = 0;
-	std::string name;
-	bool is_unsigned = false;
-	enum_field_types buffer_type = {};
-};
-
-} // namespace impl
-
-// ---------------------------------------------------------------------------
-
-struct StmtOptions
-{
-	// Enable buffering (storing) entire result set after executing a statement
-	bool buffer_results = true;
-
-	// Enable MySQL to update max_length of fields in execute result set (requires buffering)
-	bool use_max_length = true;
-};
-
-// ---------------------------------------------------------------------------
-
-// Holds ownership of bound column value buffer
-class StmtColumn
-{
-public:
-	int Index() const { return m_col.index; }
-	bool IsNull() const { return m_col.is_null; }
-	bool IsUnsigned() const { return m_col.is_unsigned; }
-	enum_field_types Type() const { return m_col.buffer_type; }
-	const std::string& Name() const { return m_col.name; }
-
-	// Get view of column value buffer
-	std::span<const uint8_t> GetBuf() const { return { m_col.buffer.data(), m_col.length }; }
-
-	// Get view of column string value. Returns nullopt if value is NULL or not a string
-	std::optional<std::string_view> GetStrView() const;
-
-	// Get column value as string. Returns nullopt if value is NULL or field type unsupported
-	std::optional<std::string> GetStr() const;
-
-	// Get column value as numeric T. Returns nullopt if value NULL or field type unsupported
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get() const;
-
-private:
-	// uses memcpy for type punning buffer data to avoid UB with strict aliasing
-	template <typename T>
-	T BitCast() const
-	{
-		T val;
-		assert(sizeof(T) == m_col.length);
-		memcpy(&val, m_col.buffer.data(), sizeof(T));
-		return val;
-	}
-
-	friend class PreparedStmt; // access to allocate and bind buffers
-	friend class StmtResult; // access to resize truncated buffers
-	impl::BindColumn m_col;
-};
-
-// ---------------------------------------------------------------------------
-
-// Provides a non-owning view of PreparedStmt column value buffers
-// Evaluates false if it does not contain a valid row
-class StmtRow
-{
-public:
-	StmtRow() = default;
-	StmtRow(std::span<const StmtColumn> columns) : m_columns(columns) {};
-
-	explicit operator bool() const noexcept { return !m_columns.empty(); }
-
-	int ColumnCount() const { return static_cast<int>(m_columns.size()); }
-	const StmtColumn* GetColumn(size_t index) const;
-	const StmtColumn* GetColumn(std::string_view name) const;
-
-	// Get specified column value as string
-	// Returns nullopt if column invalid, value is NULL, or field type unsupported
-	std::optional<std::string> operator[](size_t index) const;
-	std::optional<std::string> operator[](std::string_view name) const;
-	std::optional<std::string> GetStr(size_t index) const;
-	std::optional<std::string> GetStr(std::string_view name) const;
-
-	// Get specified column value as numeric T
-	// Returns nullopt if column invalid, value is NULL, or field type unsupported
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get(size_t index) const;
-
-	template <typename T> requires std::is_arithmetic_v<T>
-	std::optional<T> Get(std::string_view name) const;
-
-	auto begin() const { return m_columns.begin(); }
-	auto end()   const { return m_columns.end(); }
-
-private:
-	std::span<const StmtColumn> m_columns;
-};
-
-// ---------------------------------------------------------------------------
-
-// Result meta data for an executed prepared statement
-class StmtResult
-{
-public:
-	StmtResult() = default;
-	StmtResult(MYSQL_STMT* stmt, size_t columns);
-
-	int ColumnCount() const { return m_num_cols; }
-	uint64_t RowCount() const { return m_num_rows; }
-	uint64_t RowsAffected() const { return m_affected; }
-	uint64_t LastInsertID() const { return m_insert_id; }
-
-private:
-	int m_num_cols = 0;
-	uint64_t m_num_rows = 0;
-	uint64_t m_affected = 0;
-	uint64_t m_insert_id = 0;
-};
-
-// ---------------------------------------------------------------------------
-
-class PreparedStmt
-{
-public:
-	// Supported argument types for execute
-	using param_t = std::variant<int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t,
-		int64_t, uint64_t, float, double, bool, std::string_view, std::nullptr_t>;
-
-	PreparedStmt() = delete;
-	PreparedStmt(MYSQL& mysql, std::string query, Mutex* mutex, StmtOptions opts = {});
-
-	const std::string& GetQuery() const { return m_query; }
-	StmtOptions GetOptions() const { return m_options; }
-	void SetOptions(StmtOptions options) { m_options = options; }
-	void FreeResult() { mysql_stmt_free_result(m_stmt.get()); }
-
-	// Execute the prepared statement with specified arguments
-	// Throws exception on error
-	template <typename T>
-	StmtResult Execute(const std::vector<T>& args);
-	StmtResult Execute(const std::vector<param_t>& args);
-	StmtResult Execute();
-
-	// Fetch the next row into column buffers (overwrites previous row values)
-	// Return value evaluates false if no more rows to fetch
-	// Throws exception on error
-	StmtRow Fetch();
-
-private:
-	void CheckArgs(size_t argc);
-	StmtResult DoExecute();
-	void BindResults();
-	void FetchTruncated();
-	int GetResultBufferSize(const MYSQL_FIELD& field) const;
-	void ThrowError(const std::string& error);
-	std::string GetStmtError();
-
-	// bind an input value to a query parameter by index
-	template <typename T>
-	void BindInput(size_t index, T value);
-	void BindInput(size_t index, const char* str);
-	void BindInput(size_t index, const std::string& str);
-
-	struct StmtDeleter
-	{
-		Mutex* mutex = nullptr;
-		void operator()(MYSQL_STMT* stmt) noexcept;
-	};
-
-private:
-	std::unique_ptr<MYSQL_STMT, StmtDeleter> m_stmt;
-	std::vector<MYSQL_BIND> m_params;  // input binds
-	std::vector<MYSQL_BIND> m_results; // result binds
-	std::vector<impl::Bind> m_inputs;  // execute buffers (addresses bound)
-	std::vector<StmtColumn> m_columns; // fetch buffers (addresses bound)
-	std::string m_query;
-	StmtOptions m_options = {};
-	bool m_need_bind = true;
-	Mutex* m_mutex = nullptr; // connection mutex
-};
-
-} // namespace mysql
@@ -80,8 +80,6 @@ void EQ::Net::TCPConnection::Start() {
 			}
 		}
 		else if (nread == UV_EOF) {
-			connection->Disconnect();
-
 			if (buf->base) {
 				delete[] buf->base;
 			}
@@ -583,21 +583,19 @@ namespace RoF2
 				auto outapp = new EQApplicationPacket(OP_TraderShop, sizeof(BecomeTrader_Struct));
 				auto eq     = (BecomeTrader_Struct *) outapp->pBuffer;

-				eq->action           = emu->action;
-				eq->entity_id        = emu->entity_id;
-				eq->trader_id        = emu->trader_id;
-				eq->zone_id          = emu->zone_id;
-				eq->zone_instance_id = emu->zone_instance_id;
+				eq->action    = emu->action;
+				eq->entity_id = emu->entity_id;
+				eq->trader_id = emu->trader_id;
+				eq->zone_id   = emu->zone_id;
 				strn0cpy(eq->trader_name, emu->trader_name, sizeof(eq->trader_name));

 				LogTrading(
-					"(RoF2) AddTraderToBazaarWindow action <green>[{}] trader_id <green>[{}] entity_id <green>[{}] "
-					"zone_id <green>[{}] zone_instance_id <green>[{}]",
+					"(RoF2) AddTraderToBazaarWindow action <green>[{}] trader_id <green>[{}] entity_id <green>[{}] zone_id <green>[{}]",
 					eq->action,
 					eq->trader_id,
 					eq->entity_id,
-					eq->zone_id,
-					eq->zone_instance_id);
+					eq->zone_id
+				);
 				dest->FastQueuePacket(&outapp);
 				break;
 			}
@@ -1845,11 +1843,11 @@ namespace RoF2
 			}
 		}

-		safe_delete_array(in->pBuffer);
+		auto outapp     = new EQApplicationPacket(OP_GuildsList);
+		outapp->size    = packet_size;
+		outapp->pBuffer = buffer;

-		in->pBuffer = buffer;
-		in->size    = packet_size;
-		dest->FastQueuePacket(&in);
+		dest->FastQueuePacket(&outapp);
 	}

 	ENCODE(OP_GuildTributeDonateItem)
@@ -6220,11 +6218,6 @@ namespace RoF2
 				FINISH_DIRECT_DECODE();
 				break;
 			}
-			case structs::RoF2BazaarTraderBuyerActions::FirstOpenSearch: {
-				__packet->SetOpcode(OP_BazaarSearch);
-				LogTrading("(RoF2) First time opening Bazaar Search since zoning. Action <green>[{}]", action);
-				break;
-			}
 			case structs::RoF2BazaarTraderBuyerActions::WelcomeMessage: {
 				__packet->SetOpcode(OP_BazaarSearch);
 				LogTrading("(RoF2) WelcomeMessage action <green>[{}]", action);
@@ -6365,18 +6358,9 @@ namespace RoF2
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
 		strn0cpy(hdr.unknown000, fmt::format("{:016}\0", inst->GetSerialNumber()).c_str(),sizeof(hdr.unknown000));

-		hdr.stacksize = 1;
-
-		if (item->ID == PARCEL_MONEY_ITEM_ID) {
-			hdr.stacksize = inst->GetPrice();
-		} else if (inst->IsStackable()) {
-			if (inst->GetCharges() > std::numeric_limits<int16>::max()) {
-				hdr.stacksize = std::numeric_limits<uint32>::max();
-			} else {
-				hdr.stacksize = inst->GetCharges();
-			}
-		}
-
+		hdr.stacksize =
+			item->ID == PARCEL_MONEY_ITEM_ID ? inst->GetPrice() : (inst->IsStackable() ? ((inst->GetCharges() > 1000)
+				? 0xFFFFFFFF : inst->GetCharges()) : 1);
 		hdr.unknown004 = 0;

 		structs::InventorySlot_Struct slot_id{};
@@ -3119,8 +3119,7 @@ enum RoF2BazaarTraderBuyerActions {
 	BazaarInspect    = 18,
 	ClickTrader      = 28,
 	ItemMove         = 19,
-	ReconcileItems   = 20,
-	FirstOpenSearch  = 26
+	ReconcileItems   = 20
 };

 enum RoF2BuyerActions {
@@ -5,19 +5,31 @@
 #include "strings.h"

 #include <filesystem>
-
 namespace fs = std::filesystem;

+inline std::string striptrailingslash(const std::string &file_path)
+{
+	if (file_path.back() == '/' || file_path.back() == '\\') {
+		return file_path.substr(0, file_path.length() - 1);
+	}
+
+	return file_path;
+}
+
 void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();

+	if (!m_server_path.empty()) {
+		std::filesystem::current_path(m_server_path);
+	}
+
 	if (m_server_path.empty()) {
 		LogInfo("Failed to load server path");
 		return;
 	}

-	std::filesystem::current_path(m_server_path);
+	LogInfo("server [{}]", m_server_path);

 	if (!EQEmuConfig::LoadConfig()) {
 		LogError("Failed to load eqemu config");
@@ -26,64 +38,60 @@ void PathManager::LoadPaths()

 	const auto c = EQEmuConfig::get();

-	auto resolve_path = [&](const std::string& dir, const std::vector<std::string>& fallback_dirs = {}) -> std::string {
-		// relative
-		if (File::Exists((fs::path{m_server_path} / dir).string())) {
-			return fs::relative(fs::path{m_server_path} / dir).lexically_normal().string();
-		}
-
-		// absolute
-		if (File::Exists(fs::path{dir}.string())) {
-			return fs::absolute(fs::path{dir}).string();
-		}
-
-		// fallback search options if specified
-		for (const auto& fallback : fallback_dirs) {
-			if (File::Exists((fs::path{m_server_path} / fallback).string())) {
-				return fs::relative(fs::path{m_server_path} / fallback).lexically_normal().string();
-			}
-		}
-
-		// if all else fails, just set it to the config value
-		return dir;
-	};
-
-	m_maps_path          = resolve_path(c->MapDir, {"maps", "Maps"});
-	m_quests_path        = resolve_path(c->QuestDir);
-	m_plugins_path       = resolve_path(c->PluginDir);
-	m_lua_modules_path   = resolve_path(c->LuaModuleDir);
-	m_lua_mods_path      = resolve_path("mods");
-	m_patch_path         = resolve_path(c->PatchDir);
-	m_opcode_path        = resolve_path(c->OpcodeDir);
-	m_shared_memory_path = resolve_path(c->SharedMemDir);
-	m_log_path           = resolve_path(c->LogDir, {"logs"});
-
-	// Log all paths in a loop
-	std::vector<std::pair<std::string, std::string>> paths = {
-		{"server", m_server_path},
-		{"logs", m_log_path},
-		{"lua mods", m_lua_mods_path},
-		{"lua_modules", m_lua_modules_path},
-		{"maps", m_maps_path},
-		{"patches", m_patch_path},
-		{"opcode", m_opcode_path},
-		{"plugins", m_plugins_path},
-		{"quests", m_quests_path},
-		{"shared_memory", m_shared_memory_path}
-	};
-
-	constexpr int name_width   = 15;
-	constexpr int path_width   = 0;
-	constexpr int break_length = 70;
-
-	std::cout << std::endl;
-	LogInfo("{}", Strings::Repeat("-", break_length));
-	for (const auto& [name, in_path] : paths) {
-		if (!in_path.empty()) {
-			LogInfo("{:>{}} > [{:<{}}]", name, name_width, in_path, path_width);
-		}
+	// maps
+	if (File::Exists(fs::path{m_server_path + "/" + c->MapDir}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/" + c->MapDir}).string();
 	}
-	LogInfo("{}", Strings::Repeat("-", break_length));
+	else if (File::Exists(fs::path{m_server_path + "/maps"}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/maps"}).string();
+	}
+	else if (File::Exists(fs::path{m_server_path + "/Maps"}.string())) {
+		m_maps_path = fs::relative(fs::path{m_server_path + "/Maps"}).string();
+	}
+
+	// quests
+	if (File::Exists(fs::path{m_server_path + "/" + c->QuestDir}.string())) {
+		m_quests_path = fs::relative(fs::path{m_server_path + "/" + c->QuestDir}).string();
+	}
+
+	// plugins
+	if (File::Exists(fs::path{m_server_path + "/" + c->PluginDir}.string())) {
+		m_plugins_path = fs::relative(fs::path{m_server_path + "/" + c->PluginDir}).string();
+	}
+
+	// lua_modules
+	if (File::Exists(fs::path{m_server_path + "/" + c->LuaModuleDir}.string())) {
+		m_lua_modules_path = fs::relative(fs::path{m_server_path + "/" + c->LuaModuleDir}).string();
+	}
+
+	// lua mods
+	if (File::Exists(fs::path{ m_server_path + "/mods" }.string())) {
+		m_lua_mods_path = fs::relative(fs::path{ m_server_path + "/mods" }).string();
+	}
+
+	// patches
+	if (File::Exists(fs::path{m_server_path + "/" + c->PatchDir}.string())) {
+		m_patch_path = fs::relative(fs::path{m_server_path + "/" + c->PatchDir}).string();
+	}
+
+	// shared_memory_path
+	if (File::Exists(fs::path{m_server_path + "/" + c->SharedMemDir}.string())) {
+		m_shared_memory_path = fs::relative(fs::path{ m_server_path + "/" + c->SharedMemDir }).string();
+	}
+
+	// logging path
+	if (File::Exists(fs::path{m_server_path + "/" + c->LogDir}.string())) {
+		m_log_path = fs::relative(fs::path{m_server_path + "/" + c->LogDir}).string();
+	}
+
+	LogInfo("logs path [{}]", m_log_path);
+	LogInfo("lua mods path [{}]", m_lua_mods_path);
+	LogInfo("lua_modules path [{}]", m_lua_modules_path);
+	LogInfo("maps path [{}]", m_maps_path);
+	LogInfo("patches path [{}]", m_patch_path);
+	LogInfo("plugins path [{}]", m_plugins_path);
+	LogInfo("quests path [{}]", m_quests_path);
+	LogInfo("shared_memory path [{}]", m_shared_memory_path);
 }

 const std::string &PathManager::GetServerPath() const
@@ -121,11 +129,6 @@ const std::string &PathManager::GetPatchPath() const
 	return m_patch_path;
 }

-const std::string &PathManager::GetOpcodePath() const
-{
-	return m_opcode_path;
-}
-
 const std::string &PathManager::GetLuaModulesPath() const
 {
 	return m_lua_modules_path;
@@ -13,7 +13,6 @@ public:
 	[[nodiscard]] const std::string &GetLuaModulesPath() const;
 	[[nodiscard]] const std::string &GetMapsPath() const;
 	[[nodiscard]] const std::string &GetPatchPath() const;
-	[[nodiscard]] const std::string &GetOpcodePath() const;
 	[[nodiscard]] const std::string &GetPluginsPath() const;
 	[[nodiscard]] const std::string &GetQuestsPath() const;
 	[[nodiscard]] const std::string &GetServerPath() const;
@@ -25,7 +24,6 @@ private:
 	std::string m_lua_modules_path;
 	std::string m_maps_path;
 	std::string m_patch_path;
-	std::string m_opcode_path;
 	std::string m_plugins_path;
 	std::string m_quests_path;
 	std::string m_server_path;
@@ -49,23 +49,23 @@ public:
 		std::string field;

 		switch (theme_id) {
-			case LDoNTheme::GUK: {
+			case LDoNThemes::GUK: {
 				field = "guk_";
 				break;
 			}
-			case LDoNTheme::MIR: {
+			case LDoNThemes::MIR: {
 				field = "mir_";
 				break;
 			}
-			case LDoNTheme::MMC: {
+			case LDoNThemes::MMC: {
 				field = "mmc_";
 				break;
 			}
-			case LDoNTheme::RUJ: {
+			case LDoNThemes::RUJ: {
 				field = "ruj_";
 				break;
 			}
-			case LDoNTheme::TAK: {
+			case LDoNThemes::TAK: {
 				field = "tak_";
 				break;
 			}
@@ -28,14 +28,13 @@ public:
 		uint32_t aug_slot_4;
 		uint32_t aug_slot_5;
 		uint32_t aug_slot_6;
-		uint32_t item_sn;
+		int32_t  item_sn;
 		int32_t  item_charges;
-		uint32_t item_cost;
+		uint64_t item_cost;
 		uint8_t  slot_id;
 		uint32_t char_entity_id;
 		uint32_t char_zone_id;
-		int32_t  char_zone_instance_id;
-		uint8_t  active_transaction;
+		int8_t   active_transaction;
 	};

 	static std::string PrimaryKey()
@@ -61,7 +60,6 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
-			"char_zone_instance_id",
 			"active_transaction",
 		};
 	}
@@ -84,7 +82,6 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
-			"char_zone_instance_id",
 			"active_transaction",
 		};
 	}
@@ -126,23 +123,22 @@ public:
 	{
 		Trader e{};

-		e.id                    = 0;
-		e.char_id               = 0;
-		e.item_id               = 0;
-		e.aug_slot_1            = 0;
-		e.aug_slot_2            = 0;
-		e.aug_slot_3            = 0;
-		e.aug_slot_4            = 0;
-		e.aug_slot_5            = 0;
-		e.aug_slot_6            = 0;
-		e.item_sn               = 0;
-		e.item_charges          = 0;
-		e.item_cost             = 0;
-		e.slot_id               = 0;
-		e.char_entity_id        = 0;
-		e.char_zone_id          = 0;
-		e.char_zone_instance_id = 0;
-		e.active_transaction    = 0;
+		e.id                 = 0;
+		e.char_id            = 0;
+		e.item_id            = 0;
+		e.aug_slot_1         = 0;
+		e.aug_slot_2         = 0;
+		e.aug_slot_3         = 0;
+		e.aug_slot_4         = 0;
+		e.aug_slot_5         = 0;
+		e.aug_slot_6         = 0;
+		e.item_sn            = 0;
+		e.item_charges       = 0;
+		e.item_cost          = 0;
+		e.slot_id            = 0;
+		e.char_entity_id     = 0;
+		e.char_zone_id       = 0;
+		e.active_transaction = 0;

 		return e;
 	}
@@ -179,23 +175,22 @@ public:
 		if (results.RowCount() == 1) {
 			Trader e{};

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_id            = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

 			return e;
 		}
@@ -243,8 +238,7 @@ public:
 		v.push_back(columns[12] + " = " + std::to_string(e.slot_id));
 		v.push_back(columns[13] + " = " + std::to_string(e.char_entity_id));
 		v.push_back(columns[14] + " = " + std::to_string(e.char_zone_id));
-		v.push_back(columns[15] + " = " + std::to_string(e.char_zone_instance_id));
-		v.push_back(columns[16] + " = " + std::to_string(e.active_transaction));
+		v.push_back(columns[15] + " = " + std::to_string(e.active_transaction));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -281,7 +275,6 @@ public:
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.char_entity_id));
 		v.push_back(std::to_string(e.char_zone_id));
-		v.push_back(std::to_string(e.char_zone_instance_id));
 		v.push_back(std::to_string(e.active_transaction));

 		auto results = db.QueryDatabase(
@@ -327,7 +320,6 @@ public:
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.char_entity_id));
 			v.push_back(std::to_string(e.char_zone_id));
-			v.push_back(std::to_string(e.char_zone_instance_id));
 			v.push_back(std::to_string(e.active_transaction));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -362,23 +354,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Trader e{};

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_id            = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

 			all_entries.push_back(e);
 		}
@@ -403,23 +394,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Trader e{};

-			e.id                    = row[0] ? strtoull(row[0], nullptr, 10) : 0;
-			e.char_id               = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id               = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1            = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2            = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5            = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6            = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.item_sn               = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.item_charges          = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
-			e.item_cost             = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
-			e.slot_id               = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.char_entity_id        = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.char_zone_id          = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
-			e.char_zone_instance_id = row[15] ? static_cast<int32_t>(atoi(row[15])) : 0;
-			e.active_transaction    = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
+			e.id                 = row[0] ? strtoull(row[0], nullptr, 10) : 0;
+			e.char_id            = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id            = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1         = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2         = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3         = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4         = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5         = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6         = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.item_sn            = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.item_charges       = row[10] ? static_cast<int32_t>(atoi(row[10])) : 0;
+			e.item_cost          = row[11] ? strtoull(row[11], nullptr, 10) : 0;
+			e.slot_id            = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
+			e.char_entity_id     = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.char_zone_id       = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.active_transaction = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;

 			all_entries.push_back(e);
 		}
@@ -509,7 +499,6 @@ public:
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.char_entity_id));
 		v.push_back(std::to_string(e.char_zone_id));
-		v.push_back(std::to_string(e.char_zone_instance_id));
 		v.push_back(std::to_string(e.active_transaction));

 		auto results = db.QueryDatabase(
@@ -548,7 +537,6 @@ public:
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.char_entity_id));
 			v.push_back(std::to_string(e.char_zone_id));
-			v.push_back(std::to_string(e.char_zone_instance_id));
 			v.push_back(std::to_string(e.active_transaction));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -236,10 +236,6 @@ public:
 				)
 			);

-			if (buyers.empty()) {
-				return all_entries;
-			}
-
 			std::vector<std::string> char_ids{};
 			for (auto const &bl : buyers) {
 				char_ids.push_back((std::to_string(bl.char_id)));
@@ -120,10 +120,6 @@ public:
 			}

 			DeleteWhere(db, fmt::format("`char_id` = '{}';", char_id));
-			if (buy_line_ids.empty()) {
-				return false;
-			}
-
 			BaseBuyerBuyLinesRepository::DeleteWhere(
 				db,
 				fmt::format("`id` IN({})", Strings::Implode(", ", buy_line_ids))
@@ -16,7 +16,6 @@ public:
 	struct DistinctTraders_Struct {
 		uint32      trader_id;
 		uint32      zone_id;
-		uint32      zone_instance_id;
 		uint32      entity_id;
 		std::string trader_name;
 	};
@@ -36,8 +35,7 @@ public:
 	GetBazaarSearchResults(
 		SharedDatabase &db,
 		BazaarSearchCriteria_Struct search,
-		uint32 char_zone_id,
-		int32 char_zone_instance_id
+		uint32 char_zone_id
 	);

 	static BulkTraders_Struct GetDistinctTraders(Database &db)
@@ -46,7 +44,7 @@ public:
 		std::vector<DistinctTraders_Struct> distinct_traders;

 		auto results = db.QueryDatabase(
-			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
+			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_entity_id, c.name "
 			"FROM trader AS t "
 			"JOIN character_data AS c ON t.char_id = c.id;"
 		);
@@ -56,11 +54,10 @@ public:
 		for (auto row: results) {
 			DistinctTraders_Struct e{};

-			e.trader_id        = Strings::ToInt(row[0]);
-			e.zone_id          = Strings::ToInt(row[1]);
-			e.zone_instance_id = Strings::ToInt(row[2]);
-			e.entity_id        = Strings::ToInt(row[3]);
-			e.trader_name      = row[4] ? row[4] : "";
+			e.trader_id   = Strings::ToInt(row[0]);
+			e.zone_id     = Strings::ToInt(row[1]);
+			e.entity_id   = Strings::ToInt(row[2]);
+			e.trader_name = row[3] ? row[3] : "";
 			all_entries.name_length += e.trader_name.length() + 1;

 			all_entries.traders.push_back(e);
@@ -167,35 +164,37 @@ public:
 		return UpdateOne(db, m);
 	}

-	static Trader GetItemBySerialNumber(Database &db, uint32 serial_number, uint32 trader_id)
+	static Trader GetItemBySerialNumber(Database &db, uint32 serial_number)
 	{
 		Trader     e{};
 		const auto trader_item = GetWhere(
 			db,
-			fmt::format("`char_id` = '{}' AND `item_sn` = '{}' LIMIT 1", trader_id, serial_number)
+			fmt::format("`item_sn` = '{}' LIMIT 1", serial_number)
 		);

 		if (trader_item.empty()) {
 			return e;
 		}
-
-		return trader_item.at(0);
+		else {
+			return trader_item.at(0);
+		}
 	}

-	static Trader GetItemBySerialNumber(Database &db, std::string serial_number, uint32 trader_id)
+	static Trader GetItemBySerialNumber(Database &db, std::string serial_number)
 	{
 		Trader     e{};
 		auto       sn          = Strings::ToUnsignedBigInt(serial_number);
 		const auto trader_item = GetWhere(
 			db,
-			fmt::format("`char_id` = '{}' AND `item_sn` = '{}' LIMIT 1", trader_id, sn)
+			fmt::format("`item_sn` = '{}' LIMIT 1", sn)
 		);

 		if (trader_item.empty()) {
 			return e;
 		}
-
-		return trader_item.at(0);
+		else {
+			return trader_item.at(0);
+		}
 	}

 	static int UpdateActiveTransaction(Database &db, uint32 id, bool status)
@@ -218,10 +217,6 @@ public:
 			delete_ids.push_back(std::to_string(e.id));
 		}

-		if (delete_ids.empty()) {
-			return 0;
-		}
-
 		return DeleteWhere(db, fmt::format("`id` IN({})", Strings::Implode(",", delete_ids)));
 	}
 };
@@ -338,11 +338,6 @@ RULE_STRING(World, IPExemptionZones, "", "Comma-delimited list of zones to exclu
 RULE_STRING(World, MOTD, "", "Server MOTD sent on login, change from empty to have this be used instead of variables table 'motd' value")
 RULE_STRING(World, Rules, "", "Server Rules, change from empty to have this be used instead of variables table 'rules' value, lines are pipe (|) separated, example: A|B|C")
 RULE_BOOL(World, EnableAutoLogin, false, "Enables or disables auto login of characters, allowing people to log characters in directly from loginserver to ingame")
-RULE_BOOL(World, EnablePVPRegions, true, "Enables or disables PVP Regions automatically setting your PVP flag")
-RULE_STRING(World, SupportedClients, "", "Comma-delimited list of clients to restrict to. Supported values are Titanium | SoF | SoD | UF | RoF | RoF2. Example: Titanium,RoF2")
-RULE_STRING(World, CustomFilesKey, "", "Enable if the server requires custom files and sends a key to validate. Empty string to disable. Example: eqcustom_v1")
-RULE_STRING(World, CustomFilesUrl, "github.com/knervous/eqnexus/releases", "URL to display at character select if client is missing custom files")
-RULE_INT(World, CustomFilesAdminLevel, 20, "Admin level at which custom file key is not required when CustomFilesKey is specified")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Zone)
@@ -522,7 +517,6 @@ RULE_BOOL(Spells, SnareOverridesSpeedBonuses, false, "Enabling will allow snares
 RULE_INT(Spells, TargetedAOEMaxTargets, 4, "Max number of targets a Targeted AOE spell can cast on. Set to 0 for no limit.")
 RULE_INT(Spells, PointBlankAOEMaxTargets, 0, "Max number of targets a Point-Blank AOE spell can cast on. Set to 0 for no limit.")
 RULE_INT(Spells, DefaultAOEMaxTargets, 0, "Max number of targets that an AOE spell which does not meet other descriptions can cast on. Set to 0 for no limit.")
-RULE_BOOL(Spells, AllowFocusOnSkillDamageSpells, false, "Allow focus effects 185, 459, and 482 to enhance SkillAttack spell effect 193")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Combat)
@@ -684,7 +678,6 @@ RULE_BOOL(NPC, DisableLastNames, false, "Enable to disable NPC Last Names")
 RULE_BOOL(NPC, NPCIgnoreLevelBasedHasteCaps, false, "Ignores hard coded level based haste caps.")
 RULE_INT(NPC, NPCHasteCap, 150, "Haste cap for non-v3(over haste) haste")
 RULE_INT(NPC, NPCHastev3Cap, 25, "Haste cap for v3(over haste) haste")
-RULE_STRING(NPC, ExcludedFaceTargetRaces, "52,72,73,141,233,328,329,372,376,377,378,379,380,381,382,383,404,422,423,424,425,426,428,429,445,449,460,462,463,500,501,502,503,504,505,506,507,508,509,510,511,513,514,515,516,533,534,535,536,537,538,539,540,541,542,543,544,545,546,550,551,552,553,554,555,556,557,567,573,577,586,589,590,591,592,593,595,596,599,601,616,619,621,628,629,630,633,634,635,636,665,683,684,685,691,692,693,694,702,703,705,706,707,710,711,714,720,2250,2254", "Race IDs excluded from facing target when hailed")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Aggro)
@@ -319,6 +319,8 @@
 // player events
 #define ServerOP_PlayerEvent 0x5100

+#define ServerOP_DataBucketCacheUpdate 0x5200
+
 enum {
 	CZUpdateType_Character,
 	CZUpdateType_Group,
@@ -1943,7 +1945,6 @@ struct ServerOP_GuildMessage_Struct {
 struct TraderMessaging_Struct {
 	uint32 action;
 	uint32 zone_id;
-	uint32 instance_id;
 	uint32 trader_id;
 	uint32 entity_id;
 	char   trader_name[64];
@@ -83,8 +83,7 @@ struct ActivityInformation {
 		if (zone_ids.empty()) {
 			return true;
 		}
-		bool found_zone = std::any_of(zone_ids.begin(), zone_ids.end(),
-			[zone_id](int id) { return id <= 0 || id == zone_id; });
+		bool found_zone = std::find(zone_ids.begin(), zone_ids.end(), zone_id) != zone_ids.end();

 		return found_zone && (zone_version == version || zone_version == -1);
 	}
@@ -101,7 +100,7 @@ struct ActivityInformation {
 			out.WriteInt32(activity_type == TaskActivityType::GiveCash ? 1 : goal_count);
 			out.WriteLengthString(skill_list); // used in SkillOn objective type string, "-1" for none
 			out.WriteLengthString(spell_list); // used in CastOn objective type string, "0" for none
-			out.WriteString(zones);            // used in ui zone columns and task select "begins in" (may have multiple, invalid id for "Unknown Zone", empty for "ALL")
+			out.WriteString(zones);            // used in objective zone column and task select "begins in" (may have multiple, "0" for "unknown zone", empty for "ALL")
 		}
 		else
 		{
@@ -115,7 +114,7 @@ struct ActivityInformation {
 		out.WriteString(description_override);

 		if (client_version >= EQ::versions::ClientVersion::RoF) {
-			out.WriteString(zones); // target zone version internal id (unused client side)
+			out.WriteString(zones); // serialized again after description (seems unused)
 		}
 	}

@@ -25,7 +25,7 @@

 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "22.61.0-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "22.56.3-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__
@@ -42,7 +42,7 @@
 * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
 */

-#define CURRENT_BINARY_DATABASE_VERSION 9286
+#define CURRENT_BINARY_DATABASE_VERSION 9284
 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9045

 #endif
@@ -251,6 +251,4 @@ private:
  scalar m_value;
 };

-using ref = reference;
-
 } // namespace perlbind
@@ -28,8 +28,8 @@ struct pusher
    ++m_pushed;
  }
  void push(const std::string& value) { mPUSHp(value.c_str(), value.size()); ++m_pushed; }
-  void push(scalar value) { mPUSHs(value.release()); ++m_pushed; }
-  void push(reference value) { mPUSHs(value.release()); ++m_pushed; }
+  void push(scalar value) { mPUSHs(value.release()); ++m_pushed; };
+  void push(reference value) { mPUSHs(value.release()); ++m_pushed; };

  void push(array value)
  {
@@ -38,8 +38,7 @@ struct pusher
    for (int i = 0; i < count; ++i)
    {
      // mortalizes one reference to array element to avoid copying
-      SV** sv = av_fetch(static_cast<AV*>(value), i, true);
-      mPUSHs(SvREFCNT_inc(*sv));
+      PUSHs(sv_2mortal(SvREFCNT_inc(value[i].sv())));
    }
    m_pushed += count;
  }
@@ -242,7 +242,7 @@ struct read_as<hash>
  static bool check(PerlInterpreter* my_perl, int i, int ax, int items)
  {
    int remaining = items - i;
-    return remaining > 0 && remaining % 2 == 0 && SvTYPE(ST(i)) < SVt_PVAV;
+    return remaining > 0 && remaining % 2 == 0 && SvTYPE(ST(i)) == SVt_PV;
  }

  static hash get(PerlInterpreter* my_perl, int i, int ax, int items)
@@ -1,7 +1,7 @@
 #pragma once

 constexpr int perlbind_version_major = 1;
-constexpr int perlbind_version_minor = 1;
+constexpr int perlbind_version_minor = 0;
 constexpr int perlbind_version_patch = 0;

 constexpr int perlbind_version()
@@ -7,79 +7,6 @@ extern bool        run_server;
 #include "../common/eqemu_logsys.h"
 #include "../common/misc.h"
 #include "../common/path_manager.h"
-#include "../common/file.h"
-
-void CheckTitaniumOpcodeFile(const std::string &path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0021\n");
-		fprintf(f, "OP_ChatMessage=0x0016\n");
-		fprintf(f, "OP_LoginAccepted=0x0017\n");
-		fprintf(f, "OP_ServerListResponse=0x0018\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fclose(f);
-	}
-}
-
-void CheckSoDOpcodeFile(const std::string& path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0022\n");
-		fprintf(f, "OP_ChatMessage=0x0017\n");
-		fprintf(f, "OP_LoginAccepted=0x0018\n");
-		fprintf(f, "OP_ServerListResponse=0x0019\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_LoginExpansionPacketData=0x0031\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fclose(f);
-	}
-}
-
-void CheckLarionOpcodeFile(const std::string& path) {
-	if (File::Exists(path)) {
-		return;
-	}
-
-	auto f = fopen(path.c_str(), "w");
-	if (f) {
-		fprintf(f, "#EQEmu Public Login Server OPCodes\n");
-		fprintf(f, "OP_SessionReady=0x0001\n");
-		fprintf(f, "OP_Login=0x0002\n");
-		fprintf(f, "OP_ServerListRequest=0x0004\n");
-		fprintf(f, "OP_PlayEverquestRequest=0x000d\n");
-		fprintf(f, "OP_PlayEverquestResponse=0x0022\n");
-		fprintf(f, "OP_ChatMessage=0x0017\n");
-		fprintf(f, "OP_LoginAccepted=0x0018\n");
-		fprintf(f, "OP_ServerListResponse=0x0019\n");
-		fprintf(f, "OP_Poll=0x0029\n");
-		fprintf(f, "OP_EnterChat=0x000f\n");
-		fprintf(f, "OP_PollResponse=0x0011\n");
-		fprintf(f, "OP_SystemFingerprint=0x0016\n");
-		fprintf(f, "OP_ExpansionList=0x0030\n");
-		fclose(f);
-	}
-}

 ClientManager::ClientManager()
 {
@@ -92,12 +19,14 @@ ClientManager::ClientManager()

 	std::string opcodes_path = fmt::format(
 		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes.conf"
+		path.GetServerPath(),
+		server.config.GetVariableString(
+			"client_configuration",
+			"titanium_opcodes",
+			"login_opcodes.conf"
+		)
 	);

-	CheckTitaniumOpcodeFile(opcodes_path);
-
 	if (!titanium_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
 			"ClientManager fatal error: couldn't load opcodes for Titanium file [{0}]",
@@ -129,12 +58,14 @@ ClientManager::ClientManager()

 	opcodes_path = fmt::format(
 		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes_sod.conf"
+		path.GetServerPath(),
+		server.config.GetVariableString(
+			"client_configuration",
+			"sod_opcodes",
+			"login_opcodes.conf"
+		)
 	);

-	CheckSoDOpcodeFile(opcodes_path);
-
 	if (!sod_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
 			"ClientManager fatal error: couldn't load opcodes for SoD file {0}",
@@ -167,12 +98,14 @@ ClientManager::ClientManager()

 	opcodes_path = fmt::format(
 		"{}/{}",
-		path.GetOpcodePath(),
-		"login_opcodes_larion.conf"
+		path.GetServerPath(),
+		server.config.GetVariableString(
+			"client_configuration",
+			"larion_opcodes",
+			"login_opcodes.conf"
+		)
 	);

-	CheckLarionOpcodeFile(opcodes_path);
-
 	if (!larion_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
 			"ClientManager fatal error: couldn't load opcodes for Larion file [{0}]",
@@ -51,6 +51,12 @@ WorldServer::WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> wo
 		ServerOP_LSAccountUpdate,
 		std::bind(&WorldServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2)
 	);
+
+	m_keepalive = std::make_unique<EQ::Timer>(
+		1000,
+		true,
+		std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1)
+	);
 }

 WorldServer::~WorldServer() = default;
@@ -1301,6 +1307,12 @@ const std::string &WorldServer::GetVersion() const
 	return m_version;
 }

+void WorldServer::OnKeepAlive(EQ::Timer *t)
+{
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	m_connection->SendPacket(&pack);
+}
+
 void WorldServer::FormatWorldServerName(char *name, int8 server_list_type)
 {
 	std::string server_long_name = name;
@@ -187,6 +187,13 @@ private:
 	bool         m_is_server_logged_in;
 	bool         m_is_server_trusted;

+	/**
+	 * Keepalive
+	 * @param t
+	 */
+	void OnKeepAlive(EQ::Timer *t);
+	std::unique_ptr<EQ::Timer> m_keepalive;
+
 	static void FormatWorldServerName(char *name, int8 server_list_type);
 };

@@ -1,6 +1,6 @@
 {
  "name": "eqemu-server",
-  "version": "22.61.0",
+  "version": "22.56.3",
  "repository": {
    "type": "git",
    "url": "https://github.com/EQEmu/Server.git"
@@ -10,7 +10,7 @@ require (
 require (
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
@@ -10,8 +10,8 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
@@ -0,0 +1,388 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Nuget personal access tokens and Credentials
+nuget.config
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+.idea/
+*.sln.iml
@@ -0,0 +1,610 @@
+using Ionic.Zlib;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public class Connection : IConnection
+    {
+        private class EncodeType
+        {
+            public const int None = 0;
+            public const int Compression = 1;
+            public const int XOR = 4;
+        }
+
+        private enum SequenceOrder
+        {
+            Past,
+            Current,
+            Future
+        }
+
+        private readonly IParser _owner;
+        private readonly IPAddress _srcAddr;
+        private readonly int _srcPort;
+        private readonly IPAddress _dstAddr;
+        private readonly int _dstPort;
+        private readonly Util.Crc32 _crc_generator = new Util.Crc32();
+        private readonly Guid _id = Guid.NewGuid();
+        private uint _connect_code = 0;
+        private int _encode_key = 0;
+        private int _crc_bytes = 0;
+        private int[] _encode_pass = new int[2] { 0, 0 };
+        private ConnectionStream[] _client_streams = new ConnectionStream[4] {
+            new ConnectionStream(),
+            new ConnectionStream(),
+            new ConnectionStream(),
+            new ConnectionStream()
+        };
+        private ConnectionStream[] _server_streams = new ConnectionStream[4] {
+            new ConnectionStream(),
+            new ConnectionStream(),
+            new ConnectionStream(),
+            new ConnectionStream()
+        };
+
+        public IConnection.OnPacketRecvHandler OnPacketRecv { get; set; }
+
+        public IPAddress ClientAddress => _srcAddr;
+        public int ClientPort => _srcPort;
+        public IPAddress ServerAddress => _dstAddr;
+        public int ServerPort => _dstPort;
+        public Guid Id => _id;
+
+        public ConnectionType ConnectionType {
+            get
+            {
+                //World servers used to be coded to always be 9000 but live started using dynamic ports
+                //I've seen from 9000 to 9008 on live
+                if (_dstPort >= 9000 && _dstPort <= 9010)
+                {
+                    return ConnectionType.World;
+                }
+                else if (_encode_pass[0] == EncodeType.None && _encode_pass[1] == EncodeType.None)
+                {
+                    return ConnectionType.Login;
+                }
+                else if (_encode_pass[0] == EncodeType.XOR && _encode_pass[1] == EncodeType.None)
+                {
+                    return ConnectionType.Chat;
+                }
+                else if (_encode_pass[0] == EncodeType.Compression && _encode_pass[1] == EncodeType.None)
+                {
+                    return ConnectionType.Zone;
+                }
+
+                return ConnectionType.Unknown;
+            }
+        }
+
+        public Connection(IParser owner, IPAddress srcAddr, int srcPort, IPAddress dstAddr, int dstPort)
+        {
+            _owner = owner;
+            _srcAddr = srcAddr;
+            _srcPort = srcPort;
+            _dstAddr = dstAddr;
+            _dstPort = dstPort;
+        }
+
+        public void ProcessPacket(IPAddress srcAddr, int srcPort, DateTime packetTime, ReadOnlySpan<byte> data)
+        {
+            if (data.Length < 1)
+            {
+                return;
+            }
+
+            var opcode = data[1];
+            if (data[0] == 0 && (opcode == Opcode.KeepAlive || opcode == Opcode.OutboundPing))
+            {
+                return;
+            }
+
+            if (PacketCanBeDecoded(data))
+            {
+                if (!ValidateCRC(data))
+                {
+                    return;
+                }
+
+                if (_encode_pass[0] == EncodeType.None && _encode_pass[1] == EncodeType.None)
+                {
+                    ProcessDecodedPacket(srcAddr, srcPort, packetTime, data.Slice(0, data.Length - _crc_bytes));
+                }
+                else
+                {
+                    //unfortunately we can't avoid a copy here
+                    var temp = data.Slice(0, data.Length - _crc_bytes).ToArray();
+                    for (int i = 1; i >= 0; --i)
+                    {
+                        switch(_encode_pass[i])
+                        {
+                            case EncodeType.Compression:
+                                if(temp[0] == 0)
+                                {
+                                    temp = Decompress(temp, 2, temp.Length - 2);
+                                }
+                                else
+                                {
+                                    temp = Decompress(temp, 1, temp.Length - 1);
+                                }
+                                break;
+                            case EncodeType.XOR:
+                                if (temp[0] == 0)
+                                {
+                                    temp = Decode(temp, 2, temp.Length - 2);
+                                }
+                                else
+                                {
+                                    temp = Decode(temp, 1, temp.Length - 1);
+                                }
+                                break;
+                        }
+                    }
+
+                    ProcessDecodedPacket(srcAddr, srcPort, packetTime, temp);
+                }
+            }
+            else
+            {
+                ProcessDecodedPacket(srcAddr, srcPort, packetTime, data);
+            }
+        }
+
+        private void ProcessDecodedPacket(IPAddress srcAddr, int srcPort, DateTime packetTime, ReadOnlySpan<byte> data)
+        {
+            if (data.Length < 1)
+            {
+                return;
+            }
+
+            if (data[0] == 0)
+            {
+                if (data.Length < 2)
+                {
+                    return;
+                }
+
+                var opcode = data[1];
+                switch (opcode)
+                {
+                    case Opcode.SessionResponse:
+                        if (_connect_code == 0)
+                        {
+                            _connect_code = BitConverter.ToUInt32(data.Slice(2, 4));
+                            _encode_key = IPAddress.NetworkToHostOrder(BitConverter.ToInt32(data.Slice(6, 4)));
+                            _crc_bytes = data[10];
+                            _encode_pass[0] = data[11];
+                            _encode_pass[1] = data[12];
+                            _owner.OnNewConnection?.Invoke(this, packetTime);
+                        }
+                        break;
+                    case Opcode.SessionDisconnect:
+                        if(_connect_code != 0)
+                        {
+                            _connect_code = 0;
+                            _encode_key = 0;
+                            _crc_bytes = 0;
+                            _encode_pass[0] = 0;
+                            _encode_pass[1] = 0;
+                            _owner.OnLostConnection?.Invoke(this, packetTime);
+                        }
+                        break;
+                    case Opcode.Combined:
+                        {
+                            int current = 2;
+                            int end = data.Length;
+                            while (current < end)
+                            {
+                                byte subpacket_length = data[current];
+                                current += 1;
+
+                                if (end < current + subpacket_length)
+                                {
+                                    return;
+                                }
+
+                                var subpacket = data.Slice(current, subpacket_length);
+                                ProcessDecodedPacket(srcAddr, srcPort, packetTime, subpacket);
+                                current += subpacket_length;
+                            }
+                        }
+                        break;
+                    case Opcode.AppCombined:
+                        {
+                            int current = 2;
+                            int end = data.Length;
+                            while (current < end)
+                            {
+                                int subpacket_length = 0;
+                                if (data[current] == 0xff)
+                                {
+                                    if (end < current + 3)
+                                    {
+                                        return;
+                                    }
+
+                                    if (data[current + 1] == 0xff && data[current + 2] == 0xff)
+                                    {
+                                        if (end < current + 7)
+                                        {
+                                            return;
+                                        }
+
+                                        subpacket_length =
+                                            ((data[current + 3]) << 24) |
+                                            ((data[current + 4]) << 16) |
+                                            ((data[current + 5]) << 8) |
+                                            (data[current + 6]);
+
+                                        current += 7;
+                                    }
+                                    else
+                                    {
+                                        subpacket_length =
+                                            ((data[current + 1]) << 8) |
+                                            (data[current + 2]);
+
+                                        current += 3;
+                                    }
+                                }
+                                else
+                                {
+                                    subpacket_length = data[current];
+                                    current += 1;
+                                }
+
+                                var subpacket = data.Slice(current, subpacket_length);
+                                ProcessDecodedPacket(srcAddr, srcPort, packetTime, subpacket);
+                                current += subpacket_length;
+                            }
+                        }
+                        break;
+                    case Opcode.Packet:
+                    case Opcode.Packet2:
+                    case Opcode.Packet3:
+                    case Opcode.Packet4:
+                        {
+                            var stream_id = opcode - Opcode.Packet;
+                            var stream = FindStream(srcAddr, srcPort, stream_id);
+                            var sequence = (ushort)IPAddress.NetworkToHostOrder(BitConverter.ToInt16(data.Slice(2, 2)));
+                            var order = CompareSequence(stream.Sequence, sequence);
+                            if (order == SequenceOrder.Future)
+                            {
+                                if (!stream.PacketQueue.ContainsKey(sequence))
+                                {
+                                    stream.PacketQueue.Add(sequence, new ConnectionStream.QueuedPacket
+                                    {
+                                        Data = data.ToArray(),
+                                        PacketTime = packetTime
+                                    });
+                                }
+                            }
+                            else if (order == SequenceOrder.Current)
+                            {
+                                if (stream.PacketQueue.ContainsKey(sequence))
+                                {
+                                    stream.PacketQueue.Remove(sequence);
+                                }
+
+                                stream.Sequence++;
+                                ProcessDecodedPacket(srcAddr, srcPort, packetTime, data.Slice(4));
+                                ProcessQueue(srcAddr, srcPort, stream_id);
+                            }
+                        }
+                        break;
+                    case Opcode.Fragment:
+                    case Opcode.Fragment2:
+                    case Opcode.Fragment3:
+                    case Opcode.Fragment4:
+                        {
+                            var stream_id = opcode - Opcode.Fragment;
+                            var stream = FindStream(srcAddr, srcPort, stream_id);
+                            var sequence = (ushort)IPAddress.NetworkToHostOrder(BitConverter.ToInt16(data.Slice(2, 2)));
+                            var order = CompareSequence(stream.Sequence, sequence);
+                            if (order == SequenceOrder.Future)
+                            {
+                                if (!stream.PacketQueue.ContainsKey(sequence))
+                                {
+                                    stream.PacketQueue.Add(sequence, new ConnectionStream.QueuedPacket
+                                    {
+                                        Data = data.ToArray(),
+                                        PacketTime = packetTime
+                                    });
+                                }
+                            }
+                            else if (order == SequenceOrder.Current)
+                            {
+                                if (stream.PacketQueue.ContainsKey(sequence))
+                                {
+                                    stream.PacketQueue.Remove(sequence);
+                                }
+
+                                stream.Sequence++;
+
+                                if (stream.TotalFragmentedBytes == 0)
+                                {
+                                    stream.TotalFragmentedBytes = (uint)IPAddress.NetworkToHostOrder(BitConverter.ToInt32(data.Slice(4, 4)));
+                                    stream.CurrentFragmentedBytes = (uint)(data.Length - 8);
+
+                                    if(stream.FragmentBuffer == null || stream.FragmentBuffer.Length < (stream.TotalFragmentedBytes + 512))
+                                    {
+                                        stream.FragmentBuffer = new byte[stream.TotalFragmentedBytes + 512];
+                                    }
+
+                                    var target = stream.FragmentBuffer.AsSpan();
+                                    data.Slice(8).CopyTo(target);
+                                } else
+                                {
+                                    var target = stream.FragmentBuffer.AsSpan((int)stream.CurrentFragmentedBytes);
+                                    data.Slice(4).CopyTo(target);
+
+                                    stream.CurrentFragmentedBytes += (uint)(data.Length - 4);
+
+                                    if (stream.CurrentFragmentedBytes >= stream.TotalFragmentedBytes)
+                                    {
+                                        ProcessDecodedPacket(srcAddr, srcPort, packetTime,
+                                            stream.FragmentBuffer.AsSpan(0, (int)stream.TotalFragmentedBytes));
+                                        stream.CurrentFragmentedBytes = 0;
+                                        stream.TotalFragmentedBytes = 0;
+                                    }
+                                }
+
+                                ProcessQueue(srcAddr, srcPort, stream_id);
+                            }
+
+                        }
+                        break;
+                    case Opcode.Padding:
+                        OnPacketRecv?.Invoke(this, GetDirection(srcAddr, srcPort), packetTime, data.Slice(1));
+                        break;
+                    default:
+                        break;
+                }
+            } else
+            {
+                OnPacketRecv?.Invoke(this, GetDirection(srcAddr, srcPort), packetTime, data);
+            }
+        }
+
+        private void ProcessQueue(IPAddress srcAddr, int srcPort, int stream_id)
+        {
+            var stream = FindStream(srcAddr, srcPort, stream_id);
+            var sequence = stream.Sequence;
+
+            //try to get the current sequence in the queue, if it exists then process it
+            ConnectionStream.QueuedPacket value;
+            if(stream.PacketQueue.TryGetValue(sequence, out value))
+            {
+                ProcessDecodedPacket(srcAddr, srcPort, value.PacketTime, value.Data);
+            }
+        }
+
+        public bool Match(IPAddress srcAddr, int srcPort, IPAddress dstAddr, int dstPort)
+        {
+            var p1 = _srcAddr.Equals(srcAddr) && _srcPort == srcPort && _dstAddr.Equals(dstAddr) && _dstPort == dstPort;
+            var p2 = _srcAddr.Equals(dstAddr) && _srcPort == dstPort && _dstAddr.Equals(srcAddr) && _dstPort == srcPort;
+            return p1 || p2;
+        }
+
+        private SequenceOrder CompareSequence(ushort expected, ushort actual)
+        {
+            int diff = (int)actual - (int)expected;
+
+            if (diff == 0)
+            {
+                return SequenceOrder.Current;
+            }
+
+            if (diff > 0)
+            {
+                if (diff > 10000)
+                {
+                    return SequenceOrder.Past;
+                }
+
+                return SequenceOrder.Future;
+            }
+
+            if (diff < -10000)
+            {
+                return SequenceOrder.Future;
+            }
+
+            return SequenceOrder.Past;
+        }
+
+        private bool PacketCanBeDecoded(ReadOnlySpan<byte> p)
+        {
+            if (p.Length < 2)
+            {
+                return false;
+            }
+
+            if (p[0] != 0)
+            {
+                return true;
+            }
+
+            var opcode = p[1];
+
+            if (opcode == Opcode.SessionRequest || opcode == Opcode.SessionResponse || opcode == Opcode.OutOfSession)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool ValidateCRC(ReadOnlySpan<byte> p)
+        {
+            if (_crc_bytes == 0)
+            {
+                return true;
+            }
+
+            int actual = 0;
+            int calculated = _crc_generator.Calculate(p.Slice(0, p.Length - _crc_bytes), _encode_key);
+            switch (_crc_bytes)
+            {
+                case 2:
+                    actual = IPAddress.NetworkToHostOrder(BitConverter.ToInt16(p.Slice(p.Length - 2, 2))) & 0xFFFF;
+                    calculated = calculated & 0xFFFF;
+                    break;
+                case 4:
+                    actual = IPAddress.NetworkToHostOrder(BitConverter.ToInt32(p.Slice(p.Length - 4, 4)));
+                    break;
+                default:
+                    return false;
+            }
+
+            return actual == calculated;
+        }
+
+        private byte[] Decompress(byte[] p, int offset, int length)
+        {
+            if (length < 2)
+            {
+                return p;
+            }
+
+            Span<byte> header = p.AsSpan(0, offset);
+            byte flag = p[offset];
+            Span<byte> payload = p.AsSpan(offset + 1, length - 1);
+
+            if (flag == 0x5a)
+            {
+                var pl = payload.ToArray();
+                var inflated = Inflate(payload.ToArray());
+                byte[] ret = new byte[offset + inflated.Length];
+                Array.Copy(p, 0, ret, 0, offset);
+                Array.Copy(inflated, 0, ret, offset, inflated.Length);
+                return ret;
+            }
+            else if (flag == 0xa5)
+            {
+                byte[] ret = new byte[offset + length - 1];
+                Array.Copy(p, 0, ret, 0, offset);
+                Array.Copy(p, offset + 1, ret, offset, length - 1);
+                return ret;
+            }
+            else
+            {
+                return p;
+            }
+        }
+
+        private byte[] Inflate(byte[] p)
+        {
+            try
+            {
+                using (var out_stream = new MemoryStream())
+                {
+                    using (var in_stream = new MemoryStream(p))
+                    {
+                        var buffer = new byte[512];
+                        using (var zs = new ZlibStream(in_stream, CompressionMode.Decompress))
+                        {
+                            int r = 0;
+                            do
+                            {
+                                r = zs.Read(buffer, 0, 512);
+                                out_stream.Write(buffer, 0, r);
+                            } while (r == 512);
+                        }
+                    }
+
+                    var ret = out_stream.ToArray();
+                    return ret;
+                }
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        private byte[] Decode(byte[] p, int offset, int length)
+        {
+            int key = _encode_key;
+            Span<byte> buffer = p.AsSpan(offset, length);
+            int i = 0;
+            for (i = 0; i + 4 <= length; i += 4)
+            {
+                int pt = BitConverter.ToInt32(buffer.Slice(i)) ^ key;
+                key = BitConverter.ToInt32(buffer.Slice(i));
+
+                if(BitConverter.TryWriteBytes(buffer.Slice(i), pt) == false)
+                {
+                    throw new Exception("Error writing bytes back in decode.");
+                }
+            }
+
+            byte kc = (byte)(key & 0xFF);
+            for (; i < length; i++)
+            {
+                buffer[i] = (byte)(buffer[i] ^ kc);
+            }
+
+            return p;
+        }
+
+        private Direction GetDirection(IPAddress srcAddr, int srcPort)
+        {
+            if(srcAddr.Equals(_srcAddr) && srcPort == _srcPort)
+            {
+                return Direction.ClientToServer;
+            } else
+            {
+                return Direction.ServerToClient;
+            }
+        }
+
+        private ConnectionStream FindStream(IPAddress srcAddr, int srcPort, int index)
+        {
+            if (index < 0 || index > 3)
+            {
+                return null;
+            }
+
+            var dir = GetDirection(srcAddr, srcPort);
+
+            if(dir == Direction.ClientToServer)
+            {
+                return _client_streams[index];
+            } else
+            {
+                return _server_streams[index];
+            }
+        }
+
+        private class ConnectionStream
+        {
+            public class QueuedPacket
+            {
+                public byte[] Data { get; set; }
+                public DateTime PacketTime { get; set; }
+            }
+
+            public ConnectionStream()
+            {
+                Sequence = 0;
+                CurrentFragmentedBytes = 0;
+                TotalFragmentedBytes = 0;
+                FragmentBuffer = null;
+                PacketQueue = new Dictionary<ushort, QueuedPacket>();
+            }
+
+            public ushort Sequence { get; set; }
+            public uint CurrentFragmentedBytes { get; set; }
+            public uint TotalFragmentedBytes { get; set; }
+            public byte[] FragmentBuffer { get; set; }
+            public Dictionary<ushort, QueuedPacket> PacketQueue { get; set; }
+        }
+    }
+}
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public ref struct GamePacket
+    {
+        private readonly ReadOnlySpan<byte> _data;
+
+        public GamePacket(ReadOnlySpan<byte> data)
+        {
+            _data = data;
+        }
+
+        public readonly override string ToString()
+        {
+            return ToString(16);
+        }
+
+        public readonly string ToString(int columns)
+        {
+            int rows = _data.Length / columns;
+            if (_data.Length % columns != 0)
+            {
+                rows += 1;
+            }
+
+            int expected = (10 + columns * 4) * rows;
+            var sb = new StringBuilder(expected);
+
+            for(var i = 0; i < rows; ++i)
+            {
+                sb.AppendFormat("{0} |", (i * columns).ToString("X5"));
+
+                for(var j = 0; j < columns; ++j)
+                {
+                    var index = (i * 16) + j;
+                    if (index >= _data.Length)
+                    {
+                        sb.Append("   ");
+                    } else
+                    {
+                        var c = _data[index];
+                        sb.AppendFormat("{0,3}", c.ToString("X2"));
+                    }
+                }
+
+                sb.Append(" | ");
+
+                for (var j = 0; j < columns; ++j)
+                {
+                    var index = (i * 16) + j;
+                    if (index >= _data.Length)
+                    {
+                        sb.Append(" ");
+                    }
+                    else
+                    {
+                        var c = _data[index];
+                        var ch = (char)c;
+                        if (char.IsLetterOrDigit(ch) || char.IsPunctuation(ch) || char.IsSymbol(ch) || (ch == ' '))
+                        {
+                            sb.Append(ch);
+                        }
+                        else
+                        {
+                            sb.Append(".");
+                        }
+                    }
+                }
+
+                sb.AppendLine();
+            }
+
+            return sb.ToString();
+        }
+
+        public readonly string ToModelString(int max_taken, bool hex)
+        {
+            int expected = Math.Min(_data.Length, max_taken) * (hex ? 2 : 1);
+            if(expected <= 0)
+            {
+                return string.Empty;
+            }
+
+            var sb = new StringBuilder(expected);
+
+            for(var i = 0; i < Math.Min(_data.Length, max_taken); ++i)
+            {
+                var c = _data[i];
+                if(hex)
+                {
+                    sb.Append(c.ToString("X2"));
+                } else
+                {
+                    var ch = (char)c;
+                    if (char.IsLetterOrDigit(ch) || char.IsPunctuation(ch) || char.IsSymbol(ch) || (ch == ' '))
+                    {
+                        sb.Append(ch);
+                    }
+                    else
+                    {
+                        sb.Append(".");
+                    }
+                }
+            }
+
+            return sb.ToString();
+        }
+    }
+}
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public enum Direction
+    {
+        ClientToServer,
+        ServerToClient
+    }
+
+    public enum ConnectionType
+    {
+        Unknown,
+        Login,
+        World,
+        Chat,
+        Zone
+    }
+
+    public interface IConnection
+    {
+        delegate void OnPacketRecvHandler(Connection connection, Direction direction, DateTime packetTime, ReadOnlySpan<byte> data);
+        OnPacketRecvHandler OnPacketRecv { get; set; }
+
+        void ProcessPacket(IPAddress srcAddr, int srcPort, DateTime packetTime, ReadOnlySpan<byte> data);
+        bool Match(IPAddress srcAddr, int srcPort, IPAddress dstAddr, int dstPort);
+
+        ConnectionType ConnectionType { get; }
+        IPAddress ClientAddress { get; }
+        int ClientPort { get; }
+        IPAddress ServerAddress { get; }
+        int ServerPort { get; }
+        Guid Id { get; }
+    }
+}
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public interface IParser
+    {
+        delegate void ConnectionHandler(IConnection connection, DateTime connectionTime);
+        ConnectionHandler OnNewConnection { get; set; }
+        ConnectionHandler OnLostConnection { get; set; }
+        void Parse(string filename);
+    }
+}
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public class Opcode
+    {
+        public const byte Padding = 0;
+        public const byte SessionRequest = 1;
+        public const byte SessionResponse = 2;
+        public const byte Combined = 3;
+        public const byte SessionDisconnect = 5;
+        public const byte KeepAlive = 6;
+        public const byte SessionStatRequest = 7;
+        public const byte SessionStatResponse = 8;
+        public const byte Packet = 9;
+        public const byte Packet2 = 10;
+        public const byte Packet3 = 11;
+        public const byte Packet4 = 12;
+        public const byte Fragment = 13;
+        public const byte Fragment2 = 14;
+        public const byte Fragment3 = 15;
+        public const byte Fragment4 = 16;
+        public const byte OutOfOrderAck = 17;
+        public const byte OutOfOrderAck2 = 18;
+        public const byte OutOfOrderAck3 = 19;
+        public const byte OutOfOrderAck4 = 20;
+        public const byte Ack = 21;
+        public const byte Ack2 = 22;
+        public const byte Ack3 = 23;
+        public const byte Ack4 = 22;
+        public const byte AppCombined = 25;
+        public const byte OutboundPing = 28;
+        public const byte OutOfSession = 29;
+    }
+}
@@ -0,0 +1,109 @@
+using Microsoft.Extensions.Logging;
+using SharpPcap;
+using SharpPcap.LibPcap;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StreamParser.Common.Daybreak
+{
+    public class Parser : IParser
+    {
+        /**
+         * Dependencies
+         */ 
+        private readonly ILogger<Parser> _logger;
+        private readonly List<IConnection> _connections = new List<IConnection>();
+
+        public IParser.ConnectionHandler OnNewConnection { get; set; }
+        public IParser.ConnectionHandler OnLostConnection { get; set; }
+
+        public Parser(ILogger<Parser> logger)
+        {
+            _logger = logger;
+        }
+
+        public void Parse(string filename)
+        {
+            ICaptureDevice device = null;
+            try
+            {
+                device = new CaptureFileReaderDevice(filename);
+                device.Open();
+
+                device.OnPacketArrival += new PacketArrivalEventHandler(OnPacketCapture);
+
+                device.Capture();
+                device.Close();
+            } catch(Exception ex)
+            {
+                _logger.LogError(ex, "Error reading device capture.");
+            }
+        }
+
+        private void OnPacketCapture(object sender, PacketCapture capture)
+        {
+            var raw = capture.GetPacket();
+            if (raw.LinkLayerType == PacketDotNet.LinkLayers.Ethernet)
+            {
+                var packet = PacketDotNet.Packet.ParsePacket(raw.LinkLayerType, raw.Data);
+                var ipPacket = packet.Extract<PacketDotNet.IPv4Packet>();
+                var udpPacket = packet.Extract<PacketDotNet.UdpPacket>();
+
+                if (ipPacket != null && udpPacket != null)
+                {
+                    try
+                    {
+                        ProcessPacket(ipPacket.SourceAddress,
+                            udpPacket.SourcePort,
+                            ipPacket.DestinationAddress,
+                            udpPacket.DestinationPort,
+                            raw.Timeval.Date,
+                            udpPacket.PayloadData);
+                    } catch(Exception ex)
+                    {
+                        _logger.LogError(ex, "Error processing packet");
+                    }
+                }
+            }
+        }
+
+        private void ProcessPacket(IPAddress srcAddr, int srcPort, IPAddress dstAddr, int dstPort, DateTime packetTime, ReadOnlySpan<byte> data)
+        {
+            if(data.Length < 2)
+            {
+                _logger.LogTrace("Tossing packet, {0} was less than minimum packet size", data.Length);
+                return;
+            }
+
+            var c = FindConnection(srcAddr, srcPort, dstAddr, dstPort);
+
+            if(c != null)
+            {
+                c.ProcessPacket(srcAddr, srcPort, packetTime, data);
+            }
+            else if (data[0] == 0 && data[1] == Opcode.SessionRequest)
+            {
+                c = new Connection(this, srcAddr, srcPort, dstAddr, dstPort);
+                _connections.Add(c);
+                c.ProcessPacket(srcAddr, srcPort, packetTime, data);
+            }
+        }
+
+        private IConnection FindConnection(IPAddress srcAddr, int srcPort, IPAddress dstAddr, int dstPort)
+        {
+            foreach (var c in _connections)
+            {
+                if (c.Match(srcAddr, srcPort, dstAddr, dstPort))
+                {
+                    return c;
+                }
+            }
+
+            return null;
+        }
+    }
+}
@@ -0,0 +1,103 @@
+using System;
+
+namespace StreamParser.Common.Util
+{
+    public class Crc32
+    {
+        private uint[] _encodeTable =
+        {
+            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+        };
+
+        public int Calculate(ReadOnlySpan<byte> data)
+        {
+            uint crc = 0xffffffff;
+
+            for (int i = 0; i < data.Length; ++i)
+            {
+                crc = ((crc >> 8) & 0x00FFFFFF) ^ _encodeTable[(crc ^ data[i]) & 0x000000FF];
+            }
+
+            return (int)~crc;
+        }
+
+        public int Calculate(ReadOnlySpan<byte> data, int key)
+        {
+            uint crc = 0xffffffff;
+            for (int i = 0; i < 4; ++i)
+            {
+                crc = ((crc >> 8) & 0x00FFFFFF) ^ _encodeTable[(crc ^ ((key >> (i * 8)) & 0xff)) & 0x000000FF];
+            }
+
+            for (int i = 0; i < data.Length; ++i)
+            {
+                crc = ((crc >> 8) & 0x00FFFFFF) ^ _encodeTable[(crc ^ data[i]) & 0x000000FF];
+            }
+
+            return (int)~crc;
+        }
+    }
+}
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <RootNamespace>StreamParser.Common</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Iconic.Zlib.Netstandard" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="SharpPcap" Version="6.3.0" />
+  </ItemGroup>
+
+</Project>
@@ -0,0 +1,51 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.6.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "stream_parser", "stream_parser\stream_parser.csproj", "{A5662497-4771-4A00-92E7-E7790CEB20E9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "common", "common\common.csproj", "{FC625344-C003-4602-A571-D8811CF5B37A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|x64.Build.0 = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Debug|x86.Build.0 = Debug|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|x64.ActiveCfg = Release|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|x64.Build.0 = Release|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A5662497-4771-4A00-92E7-E7790CEB20E9}.Release|x86.Build.0 = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|x64.Build.0 = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Debug|x86.Build.0 = Debug|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|x64.ActiveCfg = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|x64.Build.0 = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FC625344-C003-4602-A571-D8811CF5B37A}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {89CDF826-F878-4BF4-8583-B9E66FE8B61D}
+	EndGlobalSection
+EndGlobal
@@ -0,0 +1,325 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using StreamParser.Common.Daybreak;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using CommandLine;
+using System.Globalization;
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Modes;
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.Parameters;
+using Ionic.Zlib;
+
+namespace StreamParser
+{
+    public class ConsoleHostedService : IHostedService
+    {
+        private class ParsedPacket {
+            public byte[] Data { get; set; }
+            public Direction Direction { get; set; }
+            public DateTime Time { get; set; }
+        }
+
+        private class ParsedConnection
+        {
+            public IPAddress ClientAddress { get; set; }
+            public int ClientPort { get; set; }
+            public IPAddress ServerAddress { get; set; }
+            public int ServerPort { get; set; }
+            public ConnectionType ConnectionType { get; set; }
+            public List<ParsedPacket> Packets { get; set; }
+            public DateTime ConnectedTime { get; set; }
+            public DateTime? DisconnectedTime { get; set; }
+        }
+
+        private readonly ILogger<ConsoleHostedService> _logger;
+        private readonly IHostApplicationLifetime _applicationLifetime;
+        private readonly IParser _parser;
+        private readonly Dictionary<Guid, ParsedConnection> _connections = new Dictionary<Guid, ParsedConnection>();
+
+        public ConsoleHostedService(ILogger<ConsoleHostedService> logger,
+            IHostApplicationLifetime applicationLifetime,
+            IParser parser)
+        {
+            _logger = logger;
+            _applicationLifetime = applicationLifetime;
+            _parser = parser;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _applicationLifetime.ApplicationStarted.Register(() =>
+            {
+                var args = Environment.GetCommandLineArgs();
+
+                CommandLine.Parser.Default.ParseArguments<ConsoleHostedServiceOptions>(args)
+                   .WithParsed<ConsoleHostedServiceOptions>(o =>
+                   {
+                       _parser.OnNewConnection += OnNewConnection;
+                       _parser.OnLostConnection += OnLostConnection;
+
+                       foreach(var f in o.Input)
+                       {
+                           _logger.LogInformation("Parsing {0}...", f);
+                           _parser.Parse(f);
+                       }
+
+                       foreach(var c in _connections)
+                       {
+                           if(o.Text)
+                           {
+                               DumpConnectionToTextFile(c.Value, o.Output, o.Decrypt, o.DecompressOpcodes);
+                           }
+                       }
+
+                       _applicationLifetime.StopApplication();
+                   })
+                   .WithNotParsed<ConsoleHostedServiceOptions>(e =>
+                   {
+                       bool stops_processing = false;
+                       foreach(var err in e)
+                       {
+                           _logger.LogError("Error: {0}", err.Tag);
+                           stops_processing = stops_processing || err.StopsProcessing;
+                       }
+
+                       if(stops_processing)
+                       {
+                           _applicationLifetime.StopApplication();
+                       }
+                   });
+            });
+
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
+
+        private void OnNewConnection(IConnection connection, DateTime connectionTime)
+        {
+            _logger.LogTrace("New connection {0}:{1} <-> {2}:{3} of type {4}", 
+                connection.ClientAddress, 
+                connection.ClientPort, 
+                connection.ServerAddress, 
+                connection.ServerPort,
+                connection.ConnectionType);
+            connection.OnPacketRecv += OnPacketRecv;
+
+            _connections.Add(connection.Id, new ParsedConnection
+            {
+                ClientAddress = connection.ClientAddress,
+                ClientPort = connection.ClientPort,
+                ServerAddress = connection.ServerAddress,
+                ServerPort = connection.ServerPort,
+                ConnectionType = connection.ConnectionType,
+                Packets = new List<ParsedPacket>(),
+                ConnectedTime = connectionTime,
+            });
+        }
+
+        private void OnLostConnection(IConnection connection, DateTime connectionTime)
+        {
+            _logger.LogTrace("Lost connection {0}:{1} <-> {2}:{3}",
+                connection.ClientAddress,
+                connection.ClientPort,
+                connection.ServerAddress,
+                connection.ServerPort);
+            connection.OnPacketRecv -= OnPacketRecv;
+
+            var parsedConnection = _connections.GetValueOrDefault(connection.Id);
+            parsedConnection.DisconnectedTime = connectionTime;
+        }
+
+        private void OnPacketRecv(IConnection connection, Direction direction, DateTime packetTime, ReadOnlySpan<byte> data)
+        {
+            var parsedConnection = _connections.GetValueOrDefault(connection.Id);
+            parsedConnection.Packets.Add(new ParsedPacket
+            {
+                Data = data.ToArray(),
+                Direction = direction,
+                Time = packetTime
+            });
+        }
+
+        private void DumpConnectionToTextFile(ParsedConnection c, string output, bool decrypt, IEnumerable<int> decompressOpcodes)
+        {
+            try
+            {
+                var path = output + string.Format("{0}-{1}.txt", c.ConnectionType.ToString().ToLower(), c.ConnectedTime.ToString("yyyyMMddHHmmssfff"));
+                if (File.Exists(path))
+                {
+                    File.Delete(path);
+                }
+
+                File.AppendAllText(path, string.Format("### type: {0}\n", c.ConnectionType));
+                File.AppendAllText(path, string.Format("### started: {0}\n", c.ConnectedTime.ToString("s")));
+                File.AppendAllText(path, string.Format("### ended: {0}\n", c.DisconnectedTime.HasValue ? c.DisconnectedTime.Value.ToString("s") : "unknown"));
+                File.AppendAllText(path, string.Format("### client: {0}:{1}\n", c.ClientAddress.ToString(), c.ClientPort));
+                File.AppendAllText(path, string.Format("### server: {0}:{1}\n\n", c.ServerAddress.ToString(), c.ServerPort));
+
+                foreach(var p in c.Packets)
+                {
+                    ReadOnlySpan<byte> data = p.Data;
+                    string dir = p.Direction == Direction.ClientToServer ? "Client -> Server" : "Server -> Client";
+
+                    switch (c.ConnectionType)
+                    {
+                        case ConnectionType.Login:
+                            {
+                                int opcode = BitConverter.ToUInt16(data.Slice(0, 2));
+                                {
+                                    File.AppendAllText(path,
+                                    string.Format("{0} [Opcode: 0x{1}, Size: {2}] ({3})\n", dir, opcode.ToString("X4"), data.Length - 2, p.Time.ToString("s")));
+
+                                    var gp = new GamePacket(data.Slice(2));
+                                    File.AppendAllText(path, string.Format("{0}\n", gp.ToString()));
+
+                                    if(decrypt && opcode == 2 || opcode == 24)
+                                    {
+                                        var encrypted_block = data.Slice(12, data.Length - 12);
+                                        var dec = EQDecrypt(encrypted_block);
+
+                                        if(dec != null)
+                                        {
+                                            File.AppendAllText(path, string.Format("[Decrypted Data, Offset: {0}, Size: {1}]\n", 10, dec.Length));
+                                            gp = new GamePacket(dec);
+                                            File.AppendAllText(path, string.Format("{0}\n", gp.ToString()));
+                                        }
+                                    }
+                                }
+                            }
+                            break;
+                        case ConnectionType.Chat:
+                            {
+                                int opcode = data[0];
+                                File.AppendAllText(path, 
+                                    string.Format("{0} [Opcode: 0x{1}, Size: {2}] ({3})\n", dir, opcode.ToString("X2"), data.Length - 1, p.Time.ToString("s")));
+
+                                var gp = new GamePacket(data.Slice(1));
+                                File.AppendAllText(path, string.Format("{0}\n", gp.ToString()));
+                            }
+                            break;
+                        default:
+                            {
+                                bool reported_decompressed = false;
+                                int opcode = BitConverter.ToUInt16(data.Slice(0, 2));
+                                foreach (var decompressOpcode in decompressOpcodes)
+                                {
+                                    if (opcode == decompressOpcode && data.Length > 12)
+                                    {
+                                        if (data[10] == 0x78 && data[11] == 0xDA)
+                                        {
+                                            var totalLen = BitConverter.ToInt32(data.Slice(6, 4));
+                                            if (totalLen > 0)
+                                            {
+                                                var decompressed = Inflate(data.Slice(10));
+                                                if(decompressed != null)
+                                                {
+                                                    var decompressed_gp = new GamePacket(decompressed);
+                                                    File.AppendAllText(path,
+                                                        string.Format("{0} [Opcode: 0x{1}, Size (decompressed): {2}] ({3})\n", dir, opcode.ToString("X4"), totalLen, p.Time.ToString("s")));
+
+                                                    File.AppendAllText(path, string.Format("{0}\n", decompressed_gp.ToString()));
+                                                    reported_decompressed = true;
+                                                    break;
+                                                }
+                                            }
+                                        } 
+                                        else if (data[6] == 0x78 && data[7] == 0xDA)
+                                        {
+                                            var totalLen = BitConverter.ToInt32(data.Slice(2, 4));
+                                            if (totalLen > 0)
+                                            {
+                                                var decompressed = Inflate(data.Slice(6));
+                                                if (decompressed != null)
+                                                {
+                                                    File.AppendAllText(path,
+                                                        string.Format("{0} [Opcode: 0x{1}, Size (decompressed): {2}] ({3})\n", dir, opcode.ToString("X4"), totalLen, p.Time.ToString("s")));
+
+                                                    var decompressed_gp = new GamePacket(decompressed);
+                                                    File.AppendAllText(path, string.Format("{0}\n", decompressed_gp.ToString()));
+                                                    reported_decompressed = true;
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                if (!reported_decompressed)
+                                {
+                                    File.AppendAllText(path,
+                                        string.Format("{0} [Opcode: 0x{1}, Size: {2}] ({3})\n", dir, opcode.ToString("X4"), data.Length - 2, p.Time.ToString("s")));
+                                    var gp = new GamePacket(data.Slice(2));
+                                    File.AppendAllText(path, string.Format("{0}\n", gp.ToString()));
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            catch(Exception ex)
+            {
+                _logger.LogError(ex, "Error dumping connection {0} to txt file", c.ConnectedTime.ToString("s"));
+            }
+        }
+
+        private byte[] Inflate(ReadOnlySpan<byte> data)
+        {
+            try
+            {
+                using (var out_stream = new MemoryStream())
+                using (var in_stream = new MemoryStream(data.ToArray()))
+                {
+                    const int bufferLen = 4096;
+                    var buffer = new byte[bufferLen];
+                    using (var zs = new ZlibStream(in_stream, CompressionMode.Decompress))
+                    {
+                        int r = 0;
+                        do
+                        {
+                            r = zs.Read(buffer, 0, bufferLen);
+                            out_stream.Write(buffer, 0, r);
+                        } while (r == bufferLen);
+                    }
+
+                    var ret = out_stream.ToArray();
+                    return ret;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error inflating data");
+                return null;
+            }
+        }
+
+        private byte[] EQDecrypt(ReadOnlySpan<byte> data)
+        {
+            try
+            {
+                var desEngine = new DesEngine();
+                var cbcBlockCipher = new CbcBlockCipher(desEngine);
+                var bufferedBlockCipher = new BufferedBlockCipher(cbcBlockCipher);
+                bufferedBlockCipher.Init(false, new ParametersWithIV(new KeyParameter(new byte[16]), new byte[8]));
+                var cipherData = new byte[bufferedBlockCipher.GetOutputSize(data.Length)];
+                var outputLength = bufferedBlockCipher.ProcessBytes(data.ToArray(), 0, data.Length, cipherData, 0);
+                bufferedBlockCipher.DoFinal(cipherData, outputLength);
+                return cipherData;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error decrypting EQ Datablock");
+                return null;
+            }
+        }
+    }
+}
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using CommandLine;
+
+namespace StreamParser
+{
+    public class ConsoleHostedServiceOptions
+    {
+        [Option("input", Required = true, HelpText = "Input pcap files to be processed.")]
+        public IEnumerable<string> Input { get; set; }
+
+        [Option("output", Default = "output/", HelpText = "Directory to put output files")]
+        public string Output { get; set; }
+
+        [Option("text", Default = true, HelpText = "Dump connections to text files.")]
+        public bool Text { get; set; }
+
+        [Option("binary", Default = false, HelpText = "Dump connections to binary files.")]
+        public bool Binary { get; set; }
+
+        [Option("decrypt", Default = false, HelpText = "Decrypt the \"Encrypted\" packets.")]
+        public bool Decrypt { get; set; }
+
+        [Option("decompress", Default = null, HelpText = "Which opcodes to attempt to decompress")]
+        public IEnumerable<int> DecompressOpcodes { get; set; }
+    }
+}
@@ -0,0 +1,25 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using StreamParser.Common.Daybreak;
+using System;
+
+namespace StreamParser
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args)
+        {
+            return Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddScoped<IParser, Parser>();
+                    services.AddHostedService<ConsoleHostedService>();
+                });
+        }
+    }
+}
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "stream_parser": {
+      "commandName": "Project",
+      "commandLineArgs": "--input input/cap_login_to_zone_10_16_2024.pcap --output output_test/ --binary --decrypt --decompress 16742 168 30346",
+      "workingDirectory": "E:\\Projects\\stream_parser\\stream_parser\\bin\\Debug\\net6.0\\"
+    }
+  }
+}
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <RootNamespace>StreamParser</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\common\common.csproj" />
+  </ItemGroup>
+
+</Project>
@@ -12,12 +12,12 @@ void WorldserverCLI::CopyCharacter(int argc, char **argv, argh::parser &cmd, std
 	};
 	std::vector<std::string> options   = {};

-	EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
-
 	if (cmd[{"-h", "--help"}]) {
 		return;
 	}

+	EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
 	std::string source_character_name      = cmd(2).str();
 	std::string destination_character_name = cmd(3).str();
 	std::string destination_account_name   = cmd(4).str();
@@ -526,38 +526,9 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app)
 		SendEnterWorld(cle->name());
 		SendPostEnterWorld();
 		if (!is_player_zoning) {
-			const auto supported_clients = RuleS(World, SupportedClients);
-			bool skip_char_info = false;
-			if (!supported_clients.empty()) {
-				const std::string& name = EQ::versions::ClientVersionName(m_ClientVersion);
-				const auto& clients = Strings::Split(supported_clients, ",");
-				if (std::find(clients.begin(), clients.end(), name) == clients.end()) {
-					SendUnsupportedClientPacket(
-						fmt::format(
-							"Client Not In Supported List [{}]",
-							supported_clients
-						)
-					);
-					skip_char_info = true;
-				}
-			}
-			const auto& custom_files_key = RuleS(World, CustomFilesKey);
-			if (!skip_char_info && !custom_files_key.empty() && cle->Admin() < RuleI(World, CustomFilesAdminLevel)) {
-				// Modified clients can utilize this unused block in login_info to send custom payloads on login
-				// which indicates they are using custom client files with the correct version, based on key payload.
-				const auto client_key = std::string(reinterpret_cast<char*>(login_info->unknown064));
-				if (custom_files_key != client_key) {
-					std::string message = fmt::format("Missing Files [{}]", RuleS(World, CustomFilesUrl) );
-					SendUnsupportedClientPacket(message);
-					skip_char_info = true;
-				}
-			}
-
-			if (!skip_char_info) {
-				SendExpansionInfo();
-				SendCharInfo();
-				database.LoginIP(cle->AccountID(), long2ip(GetIP()));
-			}
+			SendExpansionInfo();
+			SendCharInfo();
+			database.LoginIP(cle->AccountID(), long2ip(GetIP()));
 		}

 		cle->SetIP(GetIP());
@@ -2482,34 +2453,3 @@ void Client::SendGuildTributeOptInToggle(const GuildTributeMemberToggle *in)
 	QueuePacket(outapp);
 	safe_delete(outapp);
 }
-
-void Client::SendUnsupportedClientPacket(const std::string& message)
-{
-	EQApplicationPacket packet(OP_SendCharInfo, sizeof(CharacterSelect_Struct) + sizeof(CharacterSelectEntry_Struct));
-
-	unsigned char* buff_ptr = packet.pBuffer;
-	auto cs = (CharacterSelect_Struct*) buff_ptr;
-
-	cs->CharCount  = 1;
-	cs->TotalChars = 1;
-
-	buff_ptr += sizeof(CharacterSelect_Struct);
-
-	auto e = (CharacterSelectEntry_Struct*) buff_ptr;
-
-	strcpy(e->Name, message.c_str());
-
-	e->Race        = Race::Human;
-	e->Class       = Class::Warrior;
-	e->Level       = 1;
-	e->ShroudClass = e->Class;
-	e->ShroudRace  = e->Race;
-	e->Zone        = std::numeric_limits<uint16>::max();
-	e->Instance    = 0;
-	e->Gender      = Gender::Male;
-	e->GoHome      = 0;
-	e->Tutorial    = 0;
-	e->Enabled     = 0;
-
-	QueuePacket(&packet);
-}
@@ -120,7 +120,6 @@ private:
 	EQStreamInterface* eqs;
 	bool CanTradeFVNoDropItem();
 	void RecordPossibleHack(const std::string& message);
-	void SendUnsupportedClientPacket(const std::string& message);
 };

 bool CheckCharCreateInfoSoF(CharCreate_Struct *cc);
@@ -595,6 +595,11 @@ bool LoginServer::Connect()
 		);
 	}

+	m_keepalive = std::make_unique<EQ::Timer>(
+		1000,
+		true,
+		std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1));
+
 	return true;
 }

@@ -711,3 +716,8 @@ void LoginServer::SendAccountUpdate(ServerPacket *pack)
 	}
 }

+void LoginServer::OnKeepAlive(EQ::Timer *t)
+{
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	SendPacket(&pack);
+}
@@ -50,6 +50,7 @@ private:
 	void ProcessLSRemoteAddr(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSAccountUpdate(uint16_t opcode, EQ::Net::Packet &p);

+	void OnKeepAlive(EQ::Timer *t);
 	std::unique_ptr<EQ::Timer> m_keepalive;

 	std::unique_ptr<EQ::Net::ServertalkClient>       m_client;
@@ -22,6 +22,7 @@ void QueryServConnection::AddConnection(std::shared_ptr<EQ::Net::ServertalkServe
 	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.emplace(std::make_pair(connection->GetUUID(), connection));
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&QueryServConnection::OnKeepAlive, this, std::placeholders::_1));
 }

 void QueryServConnection::RemoveConnection(std::shared_ptr<EQ::Net::ServertalkServerConnection> connection)
@@ -53,3 +54,8 @@ bool QueryServConnection::SendPacket(ServerPacket* pack)
 	return true;
 }

+void QueryServConnection::OnKeepAlive(EQ::Timer *t)
+{
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	SendPacket(&pack);
+}
@@ -15,6 +15,7 @@ public:
 	void HandleGenericMessage(uint16_t opcode, EQ::Net::Packet &p);
 	void HandleLFGuildUpdateMessage(uint16_t opcode, EQ::Net::Packet &p);
 	bool SendPacket(ServerPacket* pack);
+	void OnKeepAlive(EQ::Timer *t);
 private:
 	std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams;
 	std::unique_ptr<EQ::Timer> m_keepalive;
@@ -31,6 +31,8 @@ void UCSConnection::SetConnection(std::shared_ptr<EQ::Net::ServertalkServerConne
 			)
 		);
 	}
+
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&UCSConnection::OnKeepAlive, this, std::placeholders::_1));
 }

 const std::shared_ptr<EQ::Net::ServertalkServerConnection> &UCSConnection::GetConnection() const
@@ -90,3 +92,13 @@ void UCSConnection::SendMessage(const char *From, const char *Message)
 	SendPacket(pack);
 	safe_delete(pack);
 }
+
+void UCSConnection::OnKeepAlive(EQ::Timer *t)
+{
+	if (!connection) {
+		return;
+	}
+
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	connection->SendPacket(&pack);
+}
@@ -23,6 +23,11 @@ private:
 	inline std::string GetIP() const { return (connection && connection->Handle()) ? connection->Handle()->RemoteIP() : 0; }
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> connection;

+	/**
+	 * Keepalive
+	 */
+	std::unique_ptr<EQ::Timer> m_keepalive;
+	void OnKeepAlive(EQ::Timer *t);
 };

 #endif /*UCS_H_*/
@@ -294,13 +294,6 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
 	database.ClearBuyerDetails();
 	LogInfo("Clearing buyer table details");

-	if (RuleB(Bots, Enabled)) {
-		LogInfo("Clearing [bot_pet_buffs] table of stale entries");
-		database.QueryDatabase(
-			"DELETE FROM bot_pet_buffs WHERE NOT EXISTS (SELECT * FROM bot_pets WHERE bot_pets.pets_index = bot_pet_buffs.pets_index)"
-		);
-	}
-
 	if (!content_db.LoadItems(hotfix_name)) {
 		LogError("Error: Could not load item data. But ignoring");
 	}
@@ -42,6 +42,7 @@ ZSList::ZSList()
 	memset(pLockedZones, 0, sizeof(pLockedZones));

 	m_tick = std::make_unique<EQ::Timer>(5000, true, std::bind(&ZSList::OnTick, this, std::placeholders::_1));
+	m_keepalive = std::make_unique<EQ::Timer>(1000, true, std::bind(&ZSList::OnKeepAlive, this, std::placeholders::_1));
 }

 ZSList::~ZSList() {
@@ -845,6 +846,13 @@ void ZSList::OnTick(EQ::Timer *t)
 	web_interface.SendEvent(out);
 }

+void ZSList::OnKeepAlive(EQ::Timer *t)
+{
+	for (auto &zone : zone_server_list) {
+		zone->SendKeepAlive();
+	}
+}
+
 const std::list<std::unique_ptr<ZoneServer>> &ZSList::getZoneServerList() const
 {
 	return zone_server_list;
@@ -72,6 +72,7 @@ public:

 private:
 	void OnTick(EQ::Timer *t);
+	void OnKeepAlive(EQ::Timer *t);
 	uint32 NextID;
 	uint16	pLockedZones[MaxLockedZones];
 	uint32 CurGroupID;
@@ -1564,6 +1564,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 			DynamicZone::HandleZoneMessage(pack);
 			break;
 		}
+		case ServerOP_DataBucketCacheUpdate: {
+			zoneserver_list.SendPacket(pack);
+
+			break;
+		}
 		case ServerOP_GuildTributeUpdate: {
 			auto data  = (GuildTributeUpdate *)pack->pBuffer;
 			auto guild = guild_mgr.GetGuildByGuildID(data->guild_id);
@@ -1750,11 +1755,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				return;
 			}

-			auto trader = client_list.FindCLEByCharacterID(in->trader_buy_struct.trader_id);
-			if (trader) {
-				zoneserver_list.SendPacket(trader->zone(), trader->instance(), pack);
-			}
-
+			zoneserver_list.SendPacket(Zones::BAZAAR, pack);
 			break;
 		}
 		case ServerOP_BuyerMessaging: {
@@ -1774,20 +1775,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 					break;
 				}
 				case Barter_SellItem: {
-					auto buyer = client_list.FindCharacter(in->buyer_name);
-					if (buyer) {
-						zoneserver_list.SendPacket(buyer->zone(), buyer->instance(), pack);
-					}
-
+					zoneserver_list.SendPacket(Zones::BAZAAR, pack);
 					break;
 				}
 				case Barter_FailedTransaction:
 				case Barter_BuyerTransactionComplete: {
-					auto seller = client_list.FindCharacter(in->seller_name);
-					if (seller) {
-						zoneserver_list.SendPacket(seller->zone(), seller->instance(), pack);
-					}
-
+					zoneserver_list.SendPacket(in->zone_id, pack);
 					break;
 				}
 				default:
@@ -54,7 +54,6 @@ SET(zone_sources
    lua_buff.cpp
    lua_corpse.cpp
    lua_client.cpp
-    lua_database.cpp
    lua_door.cpp
    lua_encounter.cpp
    lua_entity.cpp
@@ -111,7 +110,6 @@ SET(zone_sources
    perl_bot.cpp
    perl_buff.cpp
    perl_client.cpp
-    perl_database.cpp
    perl_doors.cpp
    perl_entity.cpp
    perl_expedition.cpp
@@ -137,7 +135,6 @@ SET(zone_sources
    qglobals.cpp
    queryserv.cpp
    questmgr.cpp
-    quest_db.cpp
    quest_parser_collection.cpp
    raids.cpp
    raycast_mesh.cpp
@@ -218,7 +215,6 @@ SET(zone_headers
    lua_buff.h
    lua_client.h
    lua_corpse.h
-    lua_database.h
    lua_door.h
    lua_encounter.h
    lua_entity.h
@@ -255,7 +251,6 @@ SET(zone_headers
    pathfinder_interface.h
    pathfinder_nav_mesh.h
    pathfinder_null.h
-    perl_database.h
    perlpacket.h
    petitions.h
    pets.h
@@ -265,7 +260,6 @@ SET(zone_headers
    queryserv.h
    quest_interface.h
    questmgr.h
-    quest_db.h
    quest_parser_collection.h
    raids.h
    raycast_mesh.h
@@ -1550,7 +1550,10 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts, boo
 			hit.damage_done = 0;
 		}

-		parse->EventBotMerc(EVENT_USE_SKILL, this, nullptr,
+		parse->EventBotMerc(
+			EVENT_USE_SKILL,
+			this,
+			nullptr,
 			[&]() {
 				return fmt::format(
 					"{} {}",
@@ -3075,7 +3078,10 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy

 	std::vector<std::any> args = { corpse };

-	parse->EventMercNPC(EVENT_DEATH_COMPLETE, this, owner_or_self,
+	parse->EventMercNPC(
+		EVENT_DEATH_COMPLETE,
+		this,
+		owner_or_self,
 		[&]() {
 			return fmt::format(
 				"{} {} {} {} {} {} {} {} {}",
@@ -3090,7 +3096,8 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy
 				m_combat_record.GetHealingReceived()
 			);
 		},
-		0, &args
+		0,
+		&args
 	);

 	// Zone controller process EVENT_DEATH_ZONE (Death events)
@@ -4259,7 +4266,10 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
 		if (attacker) {
 			args = { this };

-			parse->EventMob(EVENT_DAMAGE_GIVEN, attacker, this,
+			parse->EventMob(
+				EVENT_DAMAGE_GIVEN,
+				attacker,
+				this,
 				[&]() {
 					return fmt::format(
 						"{} {} {} {} {} {} {} {} {}",
@@ -4274,13 +4284,17 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
 						static_cast<int>(special)
 					);
 				},
-				0, &args
+				0,
+				&args
 			);
 		}

 		args = { attacker };

-		damage_override = parse->EventMob(EVENT_DAMAGE_TAKEN, this, attacker,
+		damage_override = parse->EventMob(
+			EVENT_DAMAGE_TAKEN,
+			this,
+			attacker,
 			[&]() {
 				return fmt::format(
 					"{} {} {} {} {} {} {} {} {}",
@@ -4295,7 +4309,8 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
 					static_cast<int>(special)
 				);
 			},
-			0, &args
+			0,
+			&args
 		);

 		if (damage_override > 0) {
@@ -1265,7 +1265,7 @@ void Bot::LoadAAs() {
 		}

 		while(current) {
-			if (current->level_req > GetLevel() || !CanUseAlternateAdvancementRank(current)) {
+			if (!CanUseAlternateAdvancementRank(current)) {
 				current = nullptr;
 			} else {
 				current = current->next;
@@ -1578,10 +1578,7 @@ bool Bot::Process()
 		return false;
 	}

-	if (m_scan_close_mobs_timer.Check()) {
-		entity_list.ScanCloseMobs(this);
-	}
-
+	ScanCloseMobProcess();
 	SpellProcess();

 	if (tic_timer.Check()) {
@@ -3089,7 +3086,6 @@ bool Bot::Spawn(Client* botCharacterOwner) {
 		m_targetable = true;
 		entity_list.AddBot(this, true, true);

-		ClearDataBucketCache();
 		DataBucket::GetDataBuckets(this);
 		LoadBotSpellSettings();
 		if (!AI_AddBotSpells(GetBotSpellID())) {
@@ -4193,7 +4189,14 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*

 				std::vector<std::any> args = { return_iterator.return_item_instance };

-				parse->EventBot(EVENT_UNEQUIP_ITEM_BOT, this, nullptr, export_string, return_iterator.return_item_instance->GetID(), &args);
+				parse->EventBot(
+					EVENT_UNEQUIP_ITEM_BOT,
+					this,
+					nullptr,
+					export_string,
+					return_iterator.return_item_instance->GetID(),
+					&args
+				);
 			}

 			if (return_instance) {
@@ -4258,7 +4261,14 @@ void Bot::PerformTradeWithClient(int16 begin_slot_id, int16 end_slot_id, Client*

 			std::vector<std::any> args = { trade_iterator.trade_item_instance };

-			parse->EventBot(EVENT_EQUIP_ITEM_BOT, this, nullptr, export_string, trade_iterator.trade_item_instance->GetID(), &args);
+			parse->EventBot(
+				EVENT_EQUIP_ITEM_BOT,
+				this,
+				nullptr,
+				export_string,
+				trade_iterator.trade_item_instance->GetID(),
+				&args
+			);
 		}

 		trade_iterator.trade_item_instance = nullptr; // actual deletion occurs in client delete below
@@ -828,7 +828,7 @@ bool BotDatabase::LoadTimers(Bot* b)
 	BotTimer_Struct t{ };

 	for (const auto& e : l) {
-		if (e.timer_value < (Timer::GetCurrentTime() + e.recast_time)) {
+		if (t.timer_value < (Timer::GetCurrentTime() + t.recast_time)) {
 			t.timer_id    = e.timer_id;
 			t.timer_value = e.timer_value;
 			t.recast_time = e.recast_time;
@@ -1451,7 +1451,7 @@ bool BotDatabase::DeletePetBuffs(const uint32 bot_id)
 		return true;
 	}

-	BotPetBuffsRepository::DeleteWhere(database, fmt::format("pets_index = {}", saved_pet_index));
+	BotPetBuffsRepository::DeleteOne(database, saved_pet_index);

 	return true;
 }
@@ -329,7 +329,7 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
 	adventure_stats_timer = nullptr;
 	adventure_leaderboard_timer = nullptr;
 	adv_data = nullptr;
-	adv_requested_theme = LDoNTheme::Unused;
+	adv_requested_theme = LDoNThemes::Unused;
 	adv_requested_id = 0;
 	adv_requested_member_count = 0;

@@ -1469,7 +1469,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 	bool is_loss = false;

 	switch (theme_id) {
-		case LDoNTheme::Unused: { // No theme, so distribute evenly across all
+		case LDoNThemes::Unused: { // No theme, so distribute evenly across all
 			int split_points = (points / 5);

 			int guk_points = (split_points + (points % 5));
@@ -1522,12 +1522,12 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 			points -= split_points;

 			if (split_points != 0) { // if anything left, recursively loop thru again
-				UpdateLDoNPoints(LDoNTheme::Unused, split_points);
+				UpdateLDoNPoints(LDoNThemes::Unused, split_points);
 			}

 			break;
 		}
-		case LDoNTheme::GUK: {
+		case LDoNThemes::GUK: {
 			if (points < 0) {
 				if (m_pp.ldon_points_guk < (0 - points)) {
 					return false;
@@ -1539,7 +1539,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 			m_pp.ldon_points_guk += points;
 			break;
 		}
-		case LDoNTheme::MIR: {
+		case LDoNThemes::MIR: {
 			if (points < 0) {
 				if (m_pp.ldon_points_mir < (0 - points)) {
 					return false;
@@ -1551,7 +1551,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 			m_pp.ldon_points_mir += points;
 			break;
 		}
-		case LDoNTheme::MMC: {
+		case LDoNThemes::MMC: {
 			if (points < 0) {
 				if (m_pp.ldon_points_mmc < (0 - points)) {
 					return false;
@@ -1563,7 +1563,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 			m_pp.ldon_points_mmc += points;
 			break;
 		}
-		case LDoNTheme::RUJ: {
+		case LDoNThemes::RUJ: {
 			if (points < 0) {
 				if (m_pp.ldon_points_ruj < (0 - points)) {
 					return false;
@@ -1575,7 +1575,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 			m_pp.ldon_points_ruj += points;
 			break;
 		}
-		case LDoNTheme::TAK: {
+		case LDoNThemes::TAK: {
 			if (points < 0) {
 				if (m_pp.ldon_points_tak < (0 - points)) {
 					return false;
@@ -1623,23 +1623,23 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 void Client::SetLDoNPoints(uint32 theme_id, uint32 points)
 {
 	switch (theme_id) {
-		case LDoNTheme::GUK: {
+		case LDoNThemes::GUK: {
 			m_pp.ldon_points_guk = points;
 			break;
 		}
-		case LDoNTheme::MIR: {
+		case LDoNThemes::MIR: {
 			m_pp.ldon_points_mir = points;
 			break;
 		}
-		case LDoNTheme::MMC: {
+		case LDoNThemes::MMC: {
 			m_pp.ldon_points_mmc = points;
 			break;
 		}
-		case LDoNTheme::RUJ: {
+		case LDoNThemes::RUJ: {
 			m_pp.ldon_points_ruj = points;
 			break;
 		}
-		case LDoNTheme::TAK: {
+		case LDoNThemes::TAK: {
 			m_pp.ldon_points_tak = points;
 			break;
 		}
@@ -5676,15 +5676,15 @@ uint32 Client::GetLDoNPointsTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNTheme::GUK:
+	case LDoNThemes::GUK:
 		return m_pp.ldon_points_guk;
-	case LDoNTheme::MIR:
+	case LDoNThemes::MIR:
 		return m_pp.ldon_points_mir;
-	case LDoNTheme::MMC:
+	case LDoNThemes::MMC:
 		return m_pp.ldon_points_mmc;
-	case LDoNTheme::RUJ:
+	case LDoNThemes::RUJ:
 		return m_pp.ldon_points_ruj;
-	case LDoNTheme::TAK:
+	case LDoNThemes::TAK:
 		return m_pp.ldon_points_tak;
 	default:
 		return 0;
@@ -5695,15 +5695,15 @@ uint32 Client::GetLDoNWinsTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNTheme::GUK:
+	case LDoNThemes::GUK:
 		return m_pp.ldon_wins_guk;
-	case LDoNTheme::MIR:
+	case LDoNThemes::MIR:
 		return m_pp.ldon_wins_mir;
-	case LDoNTheme::MMC:
+	case LDoNThemes::MMC:
 		return m_pp.ldon_wins_mmc;
-	case LDoNTheme::RUJ:
+	case LDoNThemes::RUJ:
 		return m_pp.ldon_wins_ruj;
-	case LDoNTheme::TAK:
+	case LDoNThemes::TAK:
 		return m_pp.ldon_wins_tak;
 	default:
 		return 0;
@@ -5714,15 +5714,15 @@ uint32 Client::GetLDoNLossesTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNTheme::GUK:
+	case LDoNThemes::GUK:
 		return m_pp.ldon_losses_guk;
-	case LDoNTheme::MIR:
+	case LDoNThemes::MIR:
 		return m_pp.ldon_losses_mir;
-	case LDoNTheme::MMC:
+	case LDoNThemes::MMC:
 		return m_pp.ldon_losses_mmc;
-	case LDoNTheme::RUJ:
+	case LDoNThemes::RUJ:
 		return m_pp.ldon_losses_ruj;
-	case LDoNTheme::TAK:
+	case LDoNThemes::TAK:
 		return m_pp.ldon_losses_tak;
 	default:
 		return 0;
@@ -5731,35 +5731,35 @@ uint32 Client::GetLDoNLossesTheme(uint32 t)

 void Client::UpdateLDoNWinLoss(uint32 theme_id, bool win, bool remove) {
 	switch (theme_id) {
-		case LDoNTheme::GUK:
+		case LDoNThemes::GUK:
 			if (win) {
 				m_pp.ldon_wins_guk += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_guk += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNTheme::MIR:
+		case LDoNThemes::MIR:
 			if (win) {
 				m_pp.ldon_wins_mir += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_mir += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNTheme::MMC:
+		case LDoNThemes::MMC:
 			if (win) {
 				m_pp.ldon_wins_mmc += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_mmc += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNTheme::RUJ:
+		case LDoNThemes::RUJ:
 			if (win) {
 				m_pp.ldon_wins_ruj += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_ruj += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNTheme::TAK:
+		case LDoNThemes::TAK:
 			if (win) {
 				m_pp.ldon_wins_tak += (remove ? -1 : 1);
 			} else {
@@ -6227,7 +6227,7 @@ void Client::NewAdventure(int id, int theme, const char *text, int member_count,
 void Client::ClearPendingAdventureData()
 {
 	adv_requested_id = 0;
-	adv_requested_theme = LDoNTheme::Unused;
+	adv_requested_theme = LDoNThemes::Unused;
 	safe_delete_array(adv_requested_data);
 	adv_requested_member_count = 0;
 }
@@ -8677,16 +8677,14 @@ int Client::GetAccountAge() {

 void Client::CheckRegionTypeChanges()
 {
-	if (!zone->HasWaterMap()) {
+	if (!zone->HasWaterMap())
 		return;
-	}

 	auto new_region = zone->watermap->ReturnRegionType(glm::vec3(m_Position));

 	// still same region, do nothing
-	if (last_region_type == new_region) {
+	if (last_region_type == new_region)
 		return;
-	}

 	// If we got out of water clear any water aggro for water only npcs
 	if (last_region_type == RegionTypeWater) {
@@ -8697,15 +8695,13 @@ void Client::CheckRegionTypeChanges()
 	last_region_type = new_region;

 	// PVP is the only state we need to keep track of, so we can just return now for PVP servers
-	if (RuleI(World, PVPSettings) > 0) {
+	if (RuleI(World, PVPSettings) > 0)
 		return;
-	}

-	if (last_region_type == RegionTypePVP && RuleB(World, EnablePVPRegions)) {
+	if (last_region_type == RegionTypePVP)
 		temp_pvp = true;
-	} else if (temp_pvp) {
+	else if (temp_pvp)
 		temp_pvp = false;
-	}
 }

 void Client::ProcessAggroMeter()
@@ -10461,15 +10457,27 @@ void Client::SendToInstance(std::string instance_type, std::string zone_short_na
 	MovePC(zone_id, instance_id, x, y, z, heading);
 }

-uint32 Client::CountItem(uint32 item_id)
+int Client::CountItem(uint32 item_id)
 {
-	uint32 quantity = 0;
+	int quantity = 0;
 	EQ::ItemInstance *item = nullptr;
-
-	for (const int16& slot_id : GetInventorySlots()) {
-		item = GetInv().GetItem(slot_id);
-		if (item && item->GetID() == item_id) {
-			quantity += (item->IsStackable() ? item->GetCharges() : 1);
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			item = GetInv().GetItem(slot_id);
+			if (item && item->GetID() == item_id) {
+				quantity += (item->IsStackable() ? item->GetCharges() : 1);
+			}
 		}
 	}

@@ -10486,26 +10494,30 @@ void Client::ResetItemCooldown(uint32 item_id)
 	int recast_type = item_d->RecastType;
 	bool found_item = false;

-	for (const int16& slot_id : GetInventorySlots()) {
-		item = GetInv().GetItem(slot_id);
-		if (item) {
-			item_d = item->GetItem();
-			if (
-				item_d &&
-				item->GetID() == item_id ||
-				(
-					item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM &&
-					item_d->RecastType == recast_type
-				)
-			) {
-				item->SetRecastTimestamp(0);
-				DeleteItemRecastTimer(item_d->ID);
-				SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
-				found_item = true;
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			item = GetInv().GetItem(slot_id);
+			if (item) {
+				item_d = item->GetItem();
+				if (item_d && item->GetID() == item_id || (item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM && item_d->RecastType == recast_type)) {
+					item->SetRecastTimestamp(0);
+					DeleteItemRecastTimer(item_d->ID);
+					SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
+					found_item = true;
+				}
 			}
 		}
 	}
-
 	if (!found_item) {
 		DeleteItemRecastTimer(item_id); //We didn't find the item but we still want to remove the timer
 	}
@@ -10540,20 +10552,25 @@ void Client::SetItemCooldown(uint32 item_id, bool use_saved_timer, uint32 in_sec
 		final_time = total_time - current_time;
 	}

-	for (const int16& slot_id : GetInventorySlots()) {
-		item = GetInv().GetItem(slot_id);
-		if (item) {
-			item_d = item->GetItem();
-			if (
-				item_d &&
-				item->GetID() == item_id ||
-				(
-					item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM &&
-					item_d->RecastType == recast_type
-				)
-			) {
-				item->SetRecastTimestamp(total_time);
-				SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			item = GetInv().GetItem(slot_id);
+			if (item) {
+				item_d = item->GetItem();
+				if (item_d && item->GetID() == item_id || (item_d->RecastType != RECAST_TYPE_UNLINKED_ITEM && item_d->RecastType == recast_type)) {
+					item->SetRecastTimestamp(total_time);
+					SendItemPacket(slot_id, item, ItemPacketCharmUpdate);
+				}
 			}
 		}
 	}
@@ -10596,26 +10613,38 @@ uint32 Client::GetItemCooldown(uint32 item_id)

 void Client::RemoveItem(uint32 item_id, uint32 quantity)
 {
-	uint32 removed_count = 0;
 	EQ::ItemInstance *item = nullptr;
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	int16 removed_count = 0;
+	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			if (removed_count == quantity) {
+				break;
+			}

-	for (const int16& slot_id : GetInventorySlots()) {
-		if (removed_count == quantity) {
-			break;
-		}
-
-		item = GetInv().GetItem(slot_id);
-		if (item && item->GetID() == item_id) {
-			uint32 charges    = item->IsStackable() ? item->GetCharges() : 0;
-			uint32 stack_size = std::max(charges, static_cast<uint32>(1));
-			if ((removed_count + stack_size) <= quantity) {
-				removed_count += stack_size;
-				DeleteItemInInventory(slot_id, charges, true);
-			} else {
-				uint32 amount_left = (quantity - removed_count);
-				if (amount_left > 0 && stack_size >= amount_left) {
-					removed_count += amount_left;
-					DeleteItemInInventory(slot_id, amount_left, true);
+			item = GetInv().GetItem(slot_id);
+			if (item && item->GetID() == item_id) {
+				int16 charges = item->IsStackable() ? item->GetCharges() : 0;
+				int16 stack_size = std::max(charges, static_cast<int16>(1));
+				if ((removed_count + stack_size) <= quantity) {
+					removed_count += stack_size;
+					DeleteItemInInventory(slot_id, charges, true);
+				} else {
+					int16 amount_left = (quantity - removed_count);
+					if (amount_left > 0 && stack_size >= amount_left) {
+						removed_count += amount_left;
+						DeleteItemInInventory(slot_id, amount_left, true);
+					}
 				}
 			}
 		}
@@ -12787,28 +12816,37 @@ uint16 Client::GetSkill(EQ::skills::SkillType skill_id) const
 void Client::RemoveItemBySerialNumber(uint32 serial_number, uint32 quantity)
 {
 	EQ::ItemInstance *item = nullptr;
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invslot::GUILD_TRIBUTE_BEGIN, EQ::invslot::GUILD_TRIBUTE_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	int16 removed_count = 0;
+	const size_t slot_index_count = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < slot_index_count; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			if (removed_count == quantity) {
+				break;
+			}

-	uint32 removed_count = 0;
-
-	const auto& slot_ids = GetInventorySlots();
-
-	for (const int16& slot_id : slot_ids) {
-		if (removed_count == quantity) {
-			break;
-		}
-
-		item = GetInv().GetItem(slot_id);
-		if (item && item->GetSerialNumber() == serial_number) {
-			uint32 charges    = item->IsStackable() ? item->GetCharges() : 0;
-			uint32 stack_size = std::max(charges, static_cast<uint32>(1));
-			if ((removed_count + stack_size) <= quantity) {
-				removed_count += stack_size;
-				DeleteItemInInventory(slot_id, charges, true);
-			} else {
-				uint32 amount_left = (quantity - removed_count);
-				if (amount_left > 0 && stack_size >= amount_left) {
-					removed_count += amount_left;
-					DeleteItemInInventory(slot_id, amount_left, true);
+			item = GetInv().GetItem(slot_id);
+			if (item && item->GetSerialNumber() == serial_number) {
+				int16 charges = item->IsStackable() ? item->GetCharges() : 0;
+				int16 stack_size = std::max(charges, static_cast<int16>(1));
+				if ((removed_count + stack_size) <= quantity) {
+					removed_count += stack_size;
+					DeleteItemInInventory(slot_id, charges, true);
+				} else {
+					int16 amount_left = (quantity - removed_count);
+					if (amount_left > 0 && stack_size >= amount_left) {
+						removed_count += amount_left;
+						DeleteItemInInventory(slot_id, amount_left, true);
+					}
 				}
 			}
 		}
@@ -13033,28 +13071,3 @@ void Client::ClientToNpcAggroProcess()
 		LogAggro("Checking Reverse Aggro (client->npc) scanned_npcs ([{}])", npc_scan_count);
 	}
 }
-
-const std::vector<int16>& Client::GetInventorySlots()
-{
-	static const std::vector<std::pair<int16, int16>> slots = {
-		{ EQ::invslot::POSSESSIONS_BEGIN,     EQ::invslot::POSSESSIONS_END },
-		{ EQ::invbag::GENERAL_BAGS_BEGIN,     EQ::invbag::GENERAL_BAGS_END },
-		{ EQ::invbag::CURSOR_BAG_BEGIN,       EQ::invbag::CURSOR_BAG_END },
-		{ EQ::invslot::BANK_BEGIN,            EQ::invslot::BANK_END },
-		{ EQ::invbag::BANK_BAGS_BEGIN,        EQ::invbag::BANK_BAGS_END },
-		{ EQ::invslot::SHARED_BANK_BEGIN,     EQ::invslot::SHARED_BANK_END },
-		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
-	};
-
-	static std::vector<int16> slot_ids;
-
-	if (slot_ids.empty()) {
-		for (const auto& [begin, end] : slots) {
-			for (int16 slot_id = begin; slot_id <= end; ++slot_id) {
-				slot_ids.emplace_back(slot_id);
-			}
-		}
-	}
-
-	return slot_ids;
-}
@@ -467,7 +467,6 @@ public:
 	inline ExtendedProfile_Struct& GetEPP() { return m_epp; }
 	inline EQ::InventoryProfile& GetInv() { return m_inv; }
 	inline const EQ::InventoryProfile& GetInv() const { return m_inv; }
-	const std::vector<int16>& GetInventorySlots();
 	inline PetInfo* GetPetInfo(int pet_info_type) { return pet_info_type == PetInfoType::Suspended ? &m_suspendedminion : &m_petinfo; }
 	inline InspectMessage_Struct& GetInspectMessage() { return m_inspect_message; }
 	inline const InspectMessage_Struct& GetInspectMessage() const { return m_inspect_message; }
@@ -1094,7 +1093,7 @@ public:
 	bool PushItemOnCursor(const EQ::ItemInstance& inst, bool client_update = false);
 	void SendCursorBuffer();
 	void DeleteItemInInventory(int16 slot_id, int16 quantity = 0, bool client_update = false, bool update_db = true);
-	uint32 CountItem(uint32 item_id);
+	int CountItem(uint32 item_id);
 	void ResetItemCooldown(uint32 item_id);
 	void SetItemCooldown(uint32 item_id, bool use_saved_timer = false, uint32 in_seconds = 1);
 	uint32 GetItemCooldown(uint32 item_id);
@@ -524,6 +524,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 // Finish client connecting state
 void Client::CompleteConnect()
 {
+
 	UpdateWho();
 	client_state = CLIENT_CONNECTED;
 	SendAllPackets();
@@ -860,7 +861,7 @@ void Client::CompleteConnect()
 	if (IsInAGuild()) {
 		if (firstlogon == 1) {
 			guild_mgr.UpdateDbMemberOnline(CharacterID(), true);
-			SendGuildMembersList();
+			guild_mgr.SendToWorldSendGuildMembersList(GuildID());
 		}

 		guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), zone->GetZoneID(), time(nullptr));
@@ -912,6 +913,10 @@ void Client::CompleteConnect()
 		CastToClient()->FastQueuePacket(&outapp);
 	}

+	if (ClientVersion() >= EQ::versions::ClientVersion::RoF) {
+		SendBulkBazaarTraders();
+	}
+
 	// TODO: load these states
 	// We at least will set them to the correct state for now
 	if (m_ClientVersionBit & EQ::versions::maskUFAndLater && GetPet()) {
@@ -1408,7 +1413,6 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	drakkin_details = m_pp.drakkin_details;

 	// Load Data Buckets
-	ClearDataBucketCache();
 	DataBucket::GetDataBuckets(this);

 	// Max Level for Character:PerCharacterQglobalMaxLevel and Character:PerCharacterBucketMaxLevel
@@ -2019,38 +2023,38 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			return;
 		}

-		if (item->LDoNTheme <= LDoNTheme::TAKBit) {
+		if (item->LDoNTheme <= LDoNThemeBits::TAKBit) {
 			uint32 ldon_theme;
-			if (item->LDoNTheme & LDoNTheme::TAKBit) {
+			if (item->LDoNTheme & LDoNThemeBits::TAKBit) {
 				if (m_pp.ldon_points_tak < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNTheme::TAK;
+					ldon_theme = LDoNThemes::TAK;
 				}
-			} else if (item->LDoNTheme & LDoNTheme::RUJBit) {
+			} else if (item->LDoNTheme & LDoNThemeBits::RUJBit) {
 				if (m_pp.ldon_points_ruj < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNTheme::RUJ;
+					ldon_theme = LDoNThemes::RUJ;
 				}
-			} else if (item->LDoNTheme & LDoNTheme::MMCBit) {
+			} else if (item->LDoNTheme & LDoNThemeBits::MMCBit) {
 				if (m_pp.ldon_points_mmc < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNTheme::MMC;
+					ldon_theme = LDoNThemes::MMC;
 				}
-			} else if (item->LDoNTheme & LDoNTheme::MIRBit) {
+			} else if (item->LDoNTheme & LDoNThemeBits::MIRBit) {
 				if (m_pp.ldon_points_mir < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNTheme::MIR;
+					ldon_theme = LDoNThemes::MIR;
 				}
-			} else if (item->LDoNTheme & LDoNTheme::GUKBit) {
+			} else if (item->LDoNTheme & LDoNThemeBits::GUKBit) {
 				if (m_pp.ldon_points_guk < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNTheme::GUK;
+					ldon_theme = LDoNThemes::GUK;
 				}
 			}

 			merchant_type = fmt::format(
 				"{} Point{}",
-				LDoNTheme::GetName(ldon_theme),
+				EQ::constants::GetLDoNThemeName(ldon_theme),
 				item_cost != 1 ? "s" : ""
 			);
 		}
@@ -2194,19 +2198,19 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)

 		item = database.GetItem(ml.item);
 		if (item) {
-			uint32 theme = LDoNTheme::Unused;
-			if (item->LDoNTheme > LDoNTheme::TAKBit) {
-				theme = LDoNTheme::Unused;
-			} else if (item->LDoNTheme & LDoNTheme::TAKBit) {
-				theme = LDoNTheme::TAK;
-			} else if (item->LDoNTheme & LDoNTheme::RUJBit) {
-				theme = LDoNTheme::RUJ;
-			} else if (item->LDoNTheme & LDoNTheme::MMCBit) {
-				theme = LDoNTheme::MMC;
-			} else if (item->LDoNTheme & LDoNTheme::MIRBit) {
-				theme = LDoNTheme::MIR;
-			} else if (item->LDoNTheme & LDoNTheme::GUKBit) {
-				theme = LDoNTheme::GUK;
+			uint32 theme = LDoNThemes::Unused;
+			if (item->LDoNTheme > LDoNThemeBits::TAKBit) {
+				theme = LDoNThemes::Unused;
+			} else if (item->LDoNTheme & LDoNThemeBits::TAKBit) {
+				theme = LDoNThemes::TAK;
+			} else if (item->LDoNTheme & LDoNThemeBits::RUJBit) {
+				theme = LDoNThemes::RUJ;
+			} else if (item->LDoNTheme & LDoNThemeBits::MMCBit) {
+				theme = LDoNThemes::MMC;
+			} else if (item->LDoNTheme & LDoNThemeBits::MIRBit) {
+				theme = LDoNThemes::MIR;
+			} else if (item->LDoNTheme & LDoNThemeBits::GUKBit) {
+				theme = LDoNThemes::GUK;
 			}
 			ss << "^" << item->Name << "|";
 			ss << item->ID << "|";
@@ -2727,14 +2731,6 @@ void Client::Handle_OP_AltCurrencyReclaim(const EQApplicationPacket *app)
 		return;
 	}

-	if (IsTrader()) {
-		TraderEndTrader();
-	}
-
-	if (IsBuyer()) {
-		ToggleBuyerMode(false);
-	}
-
 	/* Item to Currency Storage */
 	if (reclaim->reclaim_flag == 1) {
 		uint32 removed = NukeItem(item_id, invWhereWorn | invWherePersonal | invWhereCursor);
@@ -3247,14 +3243,30 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 							args.push_back(old_aug);

 							if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) {
-								parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args);
+								parse->EventItem(
+									EVENT_UNAUGMENT_ITEM,
+									this,
+									tobe_auged,
+									nullptr,
+									"",
+									in_augment->augment_index,
+									&args
+								);
 							}

 							args.assign(1, tobe_auged);
 							args.push_back(false);

 							if (parse->ItemHasQuestSub(old_aug, EVENT_AUGMENT_REMOVE)) {
-								parse->EventItem(EVENT_AUGMENT_REMOVE, this, old_aug, nullptr, "", in_augment->augment_index, &args);
+								parse->EventItem(
+									EVENT_AUGMENT_REMOVE,
+									this,
+									old_aug,
+									nullptr,
+									"",
+									in_augment->augment_index,
+									&args
+								);
 							}

 							if (parse->PlayerHasQuestSub(EVENT_AUGMENT_REMOVE_CLIENT)) {
@@ -3286,13 +3298,29 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 							args.push_back(aug);

 							if (parse->ItemHasQuestSub(tobe_auged, EVENT_AUGMENT_ITEM)) {
-								parse->EventItem(EVENT_AUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args);
+								parse->EventItem(
+									EVENT_AUGMENT_ITEM,
+									this,
+									tobe_auged,
+									nullptr,
+									"",
+									in_augment->augment_index,
+									&args
+								);
 							}

 							args.assign(1, tobe_auged);

 							if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_INSERT)) {
-								parse->EventItem(EVENT_AUGMENT_INSERT, this, aug, nullptr, "", in_augment->augment_index, &args);
+								parse->EventItem(
+									EVENT_AUGMENT_INSERT,
+									this,
+									aug,
+									nullptr,
+									"",
+									in_augment->augment_index,
+									&args
+								);
 							}

 							args.push_back(aug);
@@ -3362,14 +3390,30 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					args.push_back(aug);

 					if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) {
-						parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args);
+						parse->EventItem(
+							EVENT_UNAUGMENT_ITEM,
+							this,
+							tobe_auged,
+							nullptr,
+							"",
+							in_augment->augment_index,
+							&args
+						);
 					}

 					args.assign(1, tobe_auged);
 					args.push_back(false);

 					if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_REMOVE)) {
-						parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args);
+						parse->EventItem(
+							EVENT_AUGMENT_REMOVE,
+							this,
+							aug,
+							nullptr,
+							"",
+							in_augment->augment_index,
+							&args
+						);
 					}

 					args.push_back(aug);
@@ -3434,14 +3478,30 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					args.push_back(aug);

 					if (parse->ItemHasQuestSub(tobe_auged, EVENT_UNAUGMENT_ITEM)) {
-						parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args);
+						parse->EventItem(
+							EVENT_UNAUGMENT_ITEM,
+							this,
+							tobe_auged,
+							nullptr,
+							"",
+							in_augment->augment_index,
+							&args
+						);
 					}

 					args.assign(1, tobe_auged);
 					args.push_back(true);

 					if (parse->ItemHasQuestSub(aug, EVENT_AUGMENT_REMOVE)) {
-						parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args);
+						parse->EventItem(
+							EVENT_AUGMENT_REMOVE,
+							this,
+							aug,
+							nullptr,
+							"",
+							in_augment->augment_index,
+							&args
+						);
 					}

 					args.push_back(aug);
@@ -3917,10 +3977,6 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app)
 			SendBazaarWelcome();
 			break;
 		}
-		case FirstOpenSearch: {
-			SendBulkBazaarTraders();
-			break;
-		}
 		default: {
 			LogError("Malformed BazaarSearch_Struct packet received, ignoring\n");
 		}
@@ -4415,7 +4471,14 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 							int i = 0;

 							if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) {
-								i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot);
+								i = parse->EventItem(
+									EVENT_ITEM_CLICK_CAST,
+									this,
+									p_inst,
+									nullptr,
+									"",
+									castspell->inventoryslot
+								);
 							}

 							if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) {
@@ -4447,7 +4510,14 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 						int i = 0;

 						if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) {
-							i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", castspell->inventoryslot);
+							i = parse->EventItem(
+								EVENT_ITEM_CLICK_CAST,
+								this,
+								p_inst,
+								nullptr,
+								"",
+								castspell->inventoryslot
+							);
 						}

 						if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) {
@@ -4943,11 +5013,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	SetMoving(!(cy == m_Position.y && cx == m_Position.x));

 	CheckClientToNpcAggroTimer();
-
-	if (m_mob_check_moving_timer.Check()) {
-		CheckScanCloseMobsMovingTimer();
-	}
-
+	CheckScanCloseMobsMovingTimer();
 	CheckSendBulkClientPositionUpdate();

 	int32 new_animation = ppu->animation;
@@ -7937,7 +8003,6 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	SetGuildID(new_guild_id);
 	SendGuildList();
 	guild_mgr.MemberAdd(new_guild_id, CharacterID(), GetLevel(), GetClass(), GUILD_LEADER, GetZoneID(), GetName());
-	guild_mgr.SendGuildRefresh(new_guild_id, true, true, true, true);
 	guild_mgr.SendToWorldSendGuildList();
 	SendGuildSpawnAppearance();

@@ -9514,7 +9579,14 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 					int i = 0;

 					if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) {
-						i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, p_inst, nullptr, "", slot_id);
+						i = parse->EventItem(
+							EVENT_ITEM_CLICK_CAST,
+							this,
+							p_inst,
+							nullptr,
+							"",
+							slot_id
+						);
 					}

 					if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) {
@@ -9578,7 +9650,14 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 					int i = 0;

 					if (parse->ItemHasQuestSub(p_inst, EVENT_ITEM_CLICK_CAST)) {
-						i = parse->EventItem(EVENT_ITEM_CLICK_CAST, this, clickaug, nullptr, "", slot_id);
+						i = parse->EventItem(
+							EVENT_ITEM_CLICK_CAST,
+							this,
+							clickaug,
+							nullptr,
+							"",
+							slot_id
+						);
 					}

 					if (parse->PlayerHasQuestSub(EVENT_ITEM_CLICK_CAST_CLIENT)) {
@@ -179,7 +179,7 @@ bool Client::Process() {
 			}
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
+				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
 			}

 			SetDynamicZoneMemberStatus(DynamicZoneMemberStatus::Offline);
@@ -202,7 +202,7 @@ bool Client::Process() {
 			Save();
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
+				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
 			}

 			if (GetMerc())
@@ -281,9 +281,7 @@ bool Client::Process() {
 			}
 		}

-		if (m_scan_close_mobs_timer.Check()) {
-			entity_list.ScanCloseMobs(this);
-		}
+		ScanCloseMobProcess();

 		if (RuleB(Inventory, LazyLoadBank)) {
 			// poll once a second to see if we are close to a banker and we haven't loaded the bank yet
@@ -578,7 +576,7 @@ bool Client::Process() {
 			}
 			if (IsInAGuild()) {
 				guild_mgr.UpdateDbMemberOnline(CharacterID(), false);
-				guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), 0, time(nullptr));
+				guild_mgr.SendToWorldSendGuildMembersList(GuildID());
 			}

 			return false;
@@ -40,7 +40,7 @@ extern FastMath g_Math;
 void CatchSignal(int sig_num);


-int command_count; // how many commands we have
+int                                                           command_count; // how many commands we have

 // this is the pointer to the dispatch function, updated once
 // init has been performed to point at the real function
@@ -96,7 +96,7 @@ int command_init(void)
 		command_add("augmentitem", "Force augments an item. Must have the augment item window open.", AccountStatus::GMImpossible, command_augmentitem) ||
 		command_add("ban", "[Character Name] [Reason] - Ban by character name", AccountStatus::GMLeadAdmin, command_ban) ||
 		command_add("bugs", "[Close|Delete|Review|Search|View] - Handles player bug reports", AccountStatus::QuestTroupe, command_bugs) ||
-		(RuleB(Bots, Enabled) && command_add("bot", "Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", AccountStatus::Player, command_bot)) ||
+		command_add("bot", "Type \"#bot help\" or \"^help\" to the see the list of available commands for bots.", AccountStatus::Player, command_bot) ||
 		command_add("camerashake", "[Duration (Milliseconds)] [Intensity (1-10)] - Shakes the camera on everyone's screen globally.", AccountStatus::QuestTroupe, command_camerashake) ||
 		command_add("castspell", "[Spell ID] [Instant (0 = False, 1 = True, Default is 1 if Unused)] - Cast a spell", AccountStatus::Guide, command_castspell) ||
 		command_add("chat", "[Channel ID] [Message] - Send a channel message to all zones", AccountStatus::GMMgmt, command_chat) ||
@@ -1871,10 +1871,9 @@ bool Corpse::HasItem(uint32 item_id)
 	return false;
 }

-uint32 Corpse::CountItem(uint32 item_id)
+uint16 Corpse::CountItem(uint32 item_id)
 {
-	uint32 item_count = 0;
-
+	uint16 item_count = 0;
 	if (!database.GetItem(item_id)) {
 		return item_count;
 	}
@@ -1894,7 +1893,6 @@ uint32 Corpse::CountItem(uint32 item_id)
 			item_count += i->charges > 0 ? i->charges : 1;
 		}
 	}
-
 	return item_count;
 }

@@ -196,7 +196,7 @@ public:
 	/* Corpse: Loot */
 	void QueryLoot(Client *to);
 	bool HasItem(uint32 item_id);
-	uint32 CountItem(uint32 item_id);
+	uint16 CountItem(uint32 item_id);
 	uint32 GetItemIDBySlot(uint16 loot_slot);
 	uint16 GetFirstLootSlotByItemID(uint32 item_id);
 	std::vector<int> GetLootList();
@@ -8,7 +8,7 @@

 extern WorldServer worldserver;

-std::vector<DataBucketsRepository::DataBuckets> g_data_bucket_cache = {};
+std::vector<DataBucketCacheEntry> g_data_bucket_cache = {};

 void DataBucket::SetData(const std::string &bucket_key, const std::string &bucket_value, std::string expires_time)
 {
@@ -58,14 +58,14 @@ void DataBucket::SetData(const DataBucketKey &k)
 	b.value   = k.value;

 	if (bucket_id) {
-
-		// update the cache if it exists
-		if (CanCache(k)) {
-			for (auto &e: g_data_bucket_cache) {
-				if (CheckBucketMatch(e, k)) {
-					e = b;
-					break;
-				}
+		// loop cache and update cache value and timestamp
+		for (auto &ce: g_data_bucket_cache) {
+			if (CheckBucketMatch(ce.e, k)) {
+				ce.e             = b;
+				ce.updated_time  = GetCurrentTimeUNIX();
+				ce.update_action = DataBucketCacheUpdateAction::Upsert;
+				SendDataBucketCacheUpdate(ce);
+				break;
 			}
 		}

@@ -74,18 +74,28 @@ void DataBucket::SetData(const DataBucketKey &k)
 	else {
 		b.key_ = k.key;
 		b = DataBucketsRepository::InsertOne(database, b);
+		if (!ExistsInCache(b)) {
+			// add data bucket and timestamp to cache
+			auto ce = DataBucketCacheEntry{
+				.e = b,
+				.updated_time = DataBucket::GetCurrentTimeUNIX(),
+				.update_action = DataBucketCacheUpdateAction::Upsert
+			};
+
+			g_data_bucket_cache.emplace_back(ce);
+
+			SendDataBucketCacheUpdate(ce);

-		// add to cache if it doesn't exist
-		if (CanCache(k) && !ExistsInCache(b)) {
 			DeleteFromMissesCache(b);
-			g_data_bucket_cache.emplace_back(b);
 		}
 	}
 }

 std::string DataBucket::GetData(const std::string &bucket_key)
 {
-	return GetData(DataBucketKey{.key = bucket_key}).value;
+	DataBucketKey k = {};
+	k.key = bucket_key;
+	return GetData(k).value;
 }

 // GetData fetches bucket data from the database or cache if it exists
@@ -102,27 +112,22 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 		k.npc_id
 	);

-	bool can_cache = CanCache(k);
-
-	// check the cache first if we can cache
-	if (can_cache) {
-		for (const auto &e: g_data_bucket_cache) {
-			if (CheckBucketMatch(e, k)) {
-				if (e.expires > 0 && e.expires < std::time(nullptr)) {
-					LogDataBuckets("Attempted to read expired key [{}] removing from cache", e.key_);
-					DeleteData(k);
-					return DataBucketsRepository::NewEntity();
-				}
-
-				// this is a bucket miss, return empty entity
-				// we still cache bucket misses, so we don't have to hit the database
-				if (e.id == 0) {
-					return DataBucketsRepository::NewEntity();
-				}
-
-				LogDataBuckets("Returning key [{}] value [{}] from cache", e.key_, e.value);
-				return e;
+	for (const auto &ce: g_data_bucket_cache) {
+		if (CheckBucketMatch(ce.e, k)) {
+			if (ce.e.expires > 0 && ce.e.expires < std::time(nullptr)) {
+				LogDataBuckets("Attempted to read expired key [{}] removing from cache", ce.e.key_);
+				DeleteData(k);
+				return DataBucketsRepository::NewEntity();
 			}
+
+			// this is a bucket miss, return empty entity
+			// we still cache bucket misses, so we don't have to hit the database
+			if (ce.e.id == 0) {
+				return DataBucketsRepository::NewEntity();
+			}
+
+			LogDataBuckets("Returning key [{}] value [{}] from cache", ce.e.key_, ce.e.value);
+			return ce.e;
 		}
 	}

@@ -139,21 +144,23 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b

 		// if we're ignoring the misses cache, don't add to the cache
 		// the only place this is ignored is during the initial read of SetData
-		bool add_to_misses_cache = !ignore_misses_cache && can_cache;
-		if (add_to_misses_cache) {
+		if (!ignore_misses_cache) {
 			size_t size_before = g_data_bucket_cache.size();

 			// cache bucket misses, so we don't have to hit the database
 			// when scripts try to read a bucket that doesn't exist
 			g_data_bucket_cache.emplace_back(
-				DataBucketsRepository::DataBuckets{
-					.id = 0,
-					.key_ = k.key,
-					.value = "",
-					.expires = 0,
-					.character_id = k.character_id,
-					.npc_id = k.npc_id,
-					.bot_id = k.bot_id
+				DataBucketCacheEntry{
+					.e = DataBucketsRepository::DataBuckets{
+						.id = 0,
+						.key_ = k.key,
+						.value = "",
+						.expires = 0,
+						.character_id = k.character_id,
+						.npc_id = k.npc_id,
+						.bot_id = k.bot_id
+					},
+					.updated_time = DataBucket::GetCurrentTimeUNIX()
 				}
 			);

@@ -171,54 +178,60 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 		return {};
 	}

-	auto bucket = r.front();
-
 	// if the entry has expired, delete it
-	if (bucket.expires > 0 && bucket.expires < (long long) std::time(nullptr)) {
+	if (r[0].expires > 0 && r[0].expires < (long long) std::time(nullptr)) {
 		DeleteData(k);
 		return {};
 	}

-	// add to cache if it doesn't exist
-	if (can_cache) {
-		bool has_cache = false;
-
-		for (auto &e: g_data_bucket_cache) {
-			if (e.id == bucket.id) {
-				has_cache = true;
-				break;
-			}
-		}
-
-		if (!has_cache) {
-			g_data_bucket_cache.emplace_back(bucket);
+	bool      has_cache = false;
+	for (auto &ce: g_data_bucket_cache) {
+		if (ce.e.id == r[0].id) {
+			has_cache = true;
+			break;
 		}
 	}

-	return bucket;
+	if (!has_cache) {
+		// add data bucket and timestamp to cache
+		g_data_bucket_cache.emplace_back(
+			DataBucketCacheEntry{
+				.e = r[0],
+				.updated_time = DataBucket::GetCurrentTimeUNIX()
+			}
+		);
+	}
+
+	return r[0];
 }

 std::string DataBucket::GetDataExpires(const std::string &bucket_key)
 {
-	return GetDataExpires(DataBucketKey{.key = bucket_key});
+	DataBucketKey k = {};
+	k.key = bucket_key;
+
+	return GetDataExpires(k);
 }

 std::string DataBucket::GetDataRemaining(const std::string &bucket_key)
 {
-	return GetDataRemaining(DataBucketKey{.key = bucket_key});
+	DataBucketKey k = {};
+	k.key = bucket_key;
+	return GetDataRemaining(k);
 }

 bool DataBucket::DeleteData(const std::string &bucket_key)
 {
-	return DeleteData(DataBucketKey{.key = bucket_key});
+	DataBucketKey k = {};
+	k.key = bucket_key;
+	return DeleteData(k);
 }

 // GetDataBuckets bulk loads all data buckets for a mob
 bool DataBucket::GetDataBuckets(Mob *mob)
 {
-	DataBucketLoadType::Type t{};
-
-	const uint32 id = mob->GetMobTypeIdentifier();
+	DataBucketLoadType::Type t;
+	const uint32             id = mob->GetMobTypeIdentifier();

 	if (!id) {
 		return false;
@@ -230,39 +243,46 @@ bool DataBucket::GetDataBuckets(Mob *mob)
 	else if (mob->IsClient()) {
 		t = DataBucketLoadType::Client;
 	}
+	else if (mob->IsNPC()) {
+		t = DataBucketLoadType::NPC;
+	}

-	BulkLoadEntitiesToCache(t, {id});
+	BulkLoadEntities(t, {id});

 	return true;
 }

 bool DataBucket::DeleteData(const DataBucketKey &k)
 {
-	if (CanCache(k)) {
-		size_t size_before = g_data_bucket_cache.size();
+	size_t size_before = g_data_bucket_cache.size();

-		// delete from cache where contents match
-		g_data_bucket_cache.erase(
-			std::remove_if(
-				g_data_bucket_cache.begin(),
-				g_data_bucket_cache.end(),
-				[&](DataBucketsRepository::DataBuckets &e) {
-					return CheckBucketMatch(e, k);
+	// delete from cache where contents match
+	g_data_bucket_cache.erase(
+		std::remove_if(
+			g_data_bucket_cache.begin(),
+			g_data_bucket_cache.end(),
+			[&](DataBucketCacheEntry &ce) {
+				bool match = CheckBucketMatch(ce.e, k);
+				if (match) {
+					ce.update_action = DataBucketCacheUpdateAction::Delete;
+					SendDataBucketCacheUpdate(ce);
 				}
-			),
-			g_data_bucket_cache.end()
-		);

-		LogDataBuckets(
-			"Deleting bucket key [{}] bot_id [{}] character_id [{}] npc_id [{}] cache size before [{}] after [{}]",
-			k.key,
-			k.bot_id,
-			k.character_id,
-			k.npc_id,
-			size_before,
-			g_data_bucket_cache.size()
-		);
-	}
+				return match;
+			}
+		),
+		g_data_bucket_cache.end()
+	);
+
+	LogDataBuckets(
+		"Deleting bucket key [{}] bot_id [{}] character_id [{}] npc_id [{}] cache size before [{}] after [{}]",
+		k.key,
+		k.bot_id,
+		k.character_id,
+		k.npc_id,
+		size_before,
+		g_data_bucket_cache.size()
+	);

 	return DataBucketsRepository::DeleteWhere(
 		database,
@@ -351,21 +371,23 @@ bool DataBucket::CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe,
 	);
 }

-void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector<uint32> ids)
+void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32> ids)
 {
 	if (ids.empty()) {
 		return;
 	}

 	if (ids.size() == 1) {
-		bool has_cache = false;
-
-		for (const auto &e: g_data_bucket_cache) {
+		bool            has_cache = false;
+		for (const auto &ce: g_data_bucket_cache) {
 			if (t == DataBucketLoadType::Bot) {
-				has_cache = e.bot_id == ids[0];
+				has_cache = ce.e.bot_id == ids[0];
 			}
 			else if (t == DataBucketLoadType::Client) {
-				has_cache = e.character_id == ids[0];
+				has_cache = ce.e.character_id == ids[0];
+			}
+			else if (t == DataBucketLoadType::NPC) {
+				has_cache = ce.e.npc_id == ids[0];
 			}
 		}

@@ -384,6 +406,9 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 		case DataBucketLoadType::Client:
 			column = "character_id";
 			break;
+		case DataBucketLoadType::NPC:
+			column = "npc_id";
+			break;
 		default:
 			LogError("Incorrect LoadType [{}]", static_cast<int>(t));
 			break;
@@ -417,7 +442,12 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 		if (!ExistsInCache(e)) {
 			LogDataBucketsDetail("bucket id [{}] bucket key [{}] bucket value [{}]", e.id, e.key_, e.value);

-			g_data_bucket_cache.emplace_back(e);
+			g_data_bucket_cache.emplace_back(
+				DataBucketCacheEntry{
+					.e = e,
+					.updated_time = GetCurrentTimeUNIX()
+				}
+			);
 		}
 	}

@@ -431,7 +461,7 @@ void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector
 	);
 }

-void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id)
+void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id)
 {
 	size_t size_before = g_data_bucket_cache.size();

@@ -439,10 +469,11 @@ void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id)
 		std::remove_if(
 			g_data_bucket_cache.begin(),
 			g_data_bucket_cache.end(),
-			[&](DataBucketsRepository::DataBuckets &e) {
+			[&](DataBucketCacheEntry &ce) {
 				return (
-					(type == DataBucketLoadType::Bot && e.bot_id == id) ||
-					(type == DataBucketLoadType::Client && e.character_id == id)
+					(t == DataBucketLoadType::Bot && ce.e.bot_id == id) ||
+					(t == DataBucketLoadType::Client && ce.e.character_id == id) ||
+					(t == DataBucketLoadType::NPC && ce.e.npc_id == id)
 				);
 			}
 		),
@@ -451,17 +482,24 @@ void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id)

 	LogDataBuckets(
 		"LoadType [{}] id [{}] cache size before [{}] after [{}]",
-		DataBucketLoadType::Name[type],
+		DataBucketLoadType::Name[t],
 		id,
 		size_before,
 		g_data_bucket_cache.size()
 	);
 }

-bool DataBucket::ExistsInCache(const DataBucketsRepository::DataBuckets &entry)
+int64_t DataBucket::GetCurrentTimeUNIX()
 {
-	for (const auto &e: g_data_bucket_cache) {
-		if (e.id == entry.id) {
+	return std::chrono::duration_cast<std::chrono::nanoseconds>(
+		std::chrono::system_clock::now().time_since_epoch()
+	).count();
+}
+
+bool DataBucket::ExistsInCache(const DataBucketsRepository::DataBuckets &e)
+{
+	for (const auto &ce: g_data_bucket_cache) {
+		if (ce.e.id == e.id) {
 			return true;
 		}
 	}
@@ -469,6 +507,134 @@ bool DataBucket::ExistsInCache(const DataBucketsRepository::DataBuckets &entry)
 	return false;
 }

+bool DataBucket::SendDataBucketCacheUpdate(const DataBucketCacheEntry &e)
+{
+	if (!e.e.id) {
+		return false;
+	}
+
+	EQ::Net::DynamicPacket p;
+	p.PutSerialize(0, e);
+
+	auto pack_size = sizeof(ServerDataBucketCacheUpdate_Struct) + p.Length();
+	auto pack      = new ServerPacket(ServerOP_DataBucketCacheUpdate, static_cast<uint32_t>(pack_size));
+	auto buf       = reinterpret_cast<ServerDataBucketCacheUpdate_Struct *>(pack->pBuffer);
+
+	buf->cereal_size = static_cast<uint32_t>(p.Length());
+
+	memcpy(buf->cereal_data, p.Data(), p.Length());
+
+	worldserver.SendPacket(pack);
+
+	return true;
+}
+
+void DataBucket::HandleWorldMessage(ServerPacket *p)
+{
+	DataBucketCacheEntry         n;
+	auto                         s = (ServerDataBucketCacheUpdate_Struct *) p->pBuffer;
+	EQ::Util::MemoryStreamReader ss(s->cereal_data, s->cereal_size);
+	cereal::BinaryInputArchive   archive(ss);
+	archive(n);
+
+	LogDataBucketsDetail(
+		"Received cache packet for id [{}] key [{}] value [{}] action [{}]",
+		n.e.id,
+		n.e.key_,
+		n.e.value,
+		static_cast<int>(n.update_action)
+	);
+
+	// delete
+	if (n.update_action == DataBucketCacheUpdateAction::Delete) {
+		DeleteFromMissesCache(n.e);
+
+		g_data_bucket_cache.erase(
+			std::remove_if(
+				g_data_bucket_cache.begin(),
+				g_data_bucket_cache.end(),
+				[&](DataBucketCacheEntry &ce) {
+					bool match = n.e.id > 0 && ce.e.id == n.e.id;
+					if (match) {
+						LogDataBuckets(
+							"[delete] cache key [{}] id [{}] cache_size before [{}] after [{}]",
+							ce.e.key_,
+							ce.e.id,
+							g_data_bucket_cache.size(),
+							g_data_bucket_cache.size() - 1
+						);
+					}
+					return match;
+				}
+			),
+			g_data_bucket_cache.end()
+		);
+
+		return;
+	}
+
+	// update
+	bool has_key = false;
+	for (auto &ce: g_data_bucket_cache) {
+		// update cache
+		if (ce.e.id == n.e.id) {
+			// reject old updates
+			int64 time_delta = ce.updated_time - n.updated_time;
+			if (ce.updated_time >= n.updated_time) {
+				LogDataBuckets(
+					"Attempted to update older cache key [{}] rejecting old time [{}] new time [{}] delta [{}] cache_size [{}]",
+					ce.e.key_,
+					ce.updated_time,
+					n.updated_time,
+					time_delta,
+					g_data_bucket_cache.size()
+				);
+				return;
+			}
+
+			DeleteFromMissesCache(n.e);
+
+			LogDataBuckets(
+				"[update] cache id [{}] key [{}] value [{}] old time [{}] new time [{}] delta [{}] cache_size [{}]",
+				ce.e.id,
+				ce.e.key_,
+				n.e.value,
+				ce.updated_time,
+				n.updated_time,
+				time_delta,
+				g_data_bucket_cache.size()
+			);
+			ce.e            = n.e;
+			ce.updated_time = n.updated_time;
+			has_key = true;
+			break;
+		}
+	}
+
+	// create
+	if (!has_key) {
+		DeleteFromMissesCache(n.e);
+
+		size_t size_before = g_data_bucket_cache.size();
+
+		g_data_bucket_cache.emplace_back(
+			DataBucketCacheEntry{
+				.e = n.e,
+				.updated_time = GetCurrentTimeUNIX()
+			}
+		);
+
+		LogDataBuckets(
+			"[create] Adding new cache id [{}] key [{}] value [{}] cache size before [{}] after [{}]",
+			n.e.id,
+			n.e.key_,
+			n.e.value,
+			size_before,
+			g_data_bucket_cache.size()
+		);
+	}
+}
+
 void DataBucket::DeleteFromMissesCache(DataBucketsRepository::DataBuckets e)
 {
 	// delete from cache where there might have been a written bucket miss to the cache
@@ -479,11 +645,11 @@ void DataBucket::DeleteFromMissesCache(DataBucketsRepository::DataBuckets e)
 		std::remove_if(
 			g_data_bucket_cache.begin(),
 			g_data_bucket_cache.end(),
-			[&](DataBucketsRepository::DataBuckets &ce) {
-				return ce.id == 0 && ce.key_ == e.key_ &&
-					   ce.character_id == e.character_id &&
-					   ce.npc_id == e.npc_id &&
-					   ce.bot_id == e.bot_id;
+			[&](DataBucketCacheEntry &ce) {
+				return ce.e.id == 0 && ce.e.key_ == e.key_ &&
+					   ce.e.character_id == e.character_id &&
+					   ce.e.npc_id == e.npc_id &&
+					   ce.e.bot_id == e.bot_id;
 			}
 		),
 		g_data_bucket_cache.end()
@@ -501,47 +667,3 @@ void DataBucket::ClearCache()
 	g_data_bucket_cache.clear();
 	LogInfo("Cleared data buckets cache");
 }
-
-void DataBucket::DeleteFromCache(uint64 id, DataBucketLoadType::Type type)
-{
-	size_t size_before = g_data_bucket_cache.size();
-
-	g_data_bucket_cache.erase(
-		std::remove_if(
-			g_data_bucket_cache.begin(),
-			g_data_bucket_cache.end(),
-			[&](DataBucketsRepository::DataBuckets &e) {
-				switch (type) {
-					case DataBucketLoadType::Bot:
-						return e.bot_id == id;
-					case DataBucketLoadType::Client:
-						return e.character_id == id;
-					default:
-						return false;
-				}
-			}
-		),
-		g_data_bucket_cache.end()
-	);
-
-	LogDataBuckets(
-		"Deleted [{}] id [{}] from cache size before [{}] after [{}]",
-		DataBucketLoadType::Name[type],
-		id,
-		size_before,
-		g_data_bucket_cache.size()
-	);
-}
-
-// CanCache returns whether a bucket can be cached or not
-// characters are only in one zone at a time so we can cache locally to the zone
-// bots (not implemented) are only in one zone at a time so we can cache locally to the zone
-// npcs (ids) can be in multiple zones so we can't cache locally to the zone
-bool DataBucket::CanCache(const DataBucketKey &key)
-{
-	if (key.character_id > 0 || key.bot_id > 0) {
-		return true;
-	}
-
-	return false;
-}
@@ -1,3 +1,7 @@
+//
+// Created by Akkadius on 7/7/18.
+//
+
 #ifndef EQEMU_DATABUCKET_H
 #define EQEMU_DATABUCKET_H

@@ -8,6 +12,27 @@
 #include "../common/json/json_archive_single_line.h"
 #include "../common/servertalk.h"

+enum DataBucketCacheUpdateAction : uint8 {
+	Upsert,
+	Delete
+};
+
+struct DataBucketCacheEntry {
+	DataBucketsRepository::DataBuckets e;
+	int64_t                            updated_time{};
+	DataBucketCacheUpdateAction        update_action{};
+
+	template<class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(
+			CEREAL_NVP(e),
+			CEREAL_NVP(updated_time),
+			CEREAL_NVP(update_action)
+		);
+	}
+};
+
 struct DataBucketKey {
 	std::string key;
 	std::string value;
@@ -21,12 +46,14 @@ namespace DataBucketLoadType {
 	enum Type : uint8 {
 		Bot,
 		Client,
+		NPC,
 		MaxType
 	};

 	static const std::string Name[Type::MaxType] = {
 		"Bot",
 		"Client",
+		"NPC",
 	};
 }

@@ -41,6 +68,8 @@ public:

 	static bool GetDataBuckets(Mob *mob);

+	static int64_t GetCurrentTimeUNIX();
+
 	// scoped bucket methods
 	static void SetData(const DataBucketKey &k);
 	static bool DeleteData(const DataBucketKey &k);
@@ -51,15 +80,15 @@ public:

 	// bucket repository versus key matching
 	static bool CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe, const DataBucketKey &k);
-	static bool ExistsInCache(const DataBucketsRepository::DataBuckets &entry);
+	static bool ExistsInCache(const DataBucketsRepository::DataBuckets &e);

-	static void BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector<uint32> ids);
-	static void DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id);
+	static void BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32> ids);
+	static void DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id);

+	static bool SendDataBucketCacheUpdate(const DataBucketCacheEntry &e);
+	static void HandleWorldMessage(ServerPacket *p);
 	static void DeleteFromMissesCache(DataBucketsRepository::DataBuckets e);
 	static void ClearCache();
-	static void DeleteFromCache(uint64 id, DataBucketLoadType::Type type);
-	static bool CanCache(const DataBucketKey &key);
 };

 #endif //EQEMU_DATABUCKET_H
@@ -58,7 +58,6 @@ void perl_register_expedition_lock_messages();
 void perl_register_bot();
 void perl_register_buff();
 void perl_register_merc();
-void perl_register_database();
 #endif // EMBPERL_XS_CLASSES
 #endif // EMBPERL_XS

@@ -1186,7 +1185,6 @@ void PerlembParser::MapFunctions()
 	perl_register_bot();
 	perl_register_buff();
 	perl_register_merc();
-	perl_register_database();
 #endif // EMBPERL_XS_CLASSES
 }

@@ -1736,7 +1734,7 @@ void PerlembParser::ExportEventVariables(
 		case EVENT_PAYLOAD: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "payload_id", sep.arg[0]);
-			ExportVar(package_name.c_str(), "payload_value", sep.argplus[1]);
+			ExportVar(package_name.c_str(), "payload_value", sep.arg[1]);
 			break;
 		}

@@ -1446,7 +1446,7 @@ int Perl__collectitems(uint32_t item_id, bool remove_item)
 	return quest_manager.collectitems(item_id, remove_item);
 }

-uint32 Perl__countitem(uint32_t item_id)
+int Perl__countitem(uint32_t item_id)
 {
 	return quest_manager.countitem(item_id);
 }
@@ -5978,16 +5978,6 @@ bool Perl__aretaskscompleted(perl::array task_ids)
 	return quest_manager.aretaskscompleted(v);
 }

-void Perl__SpawnCircle(uint32 npc_id, float x, float y, float z, float heading, float radius, uint32 points)
-{
-	quest_manager.SpawnCircle(npc_id, glm::vec4(x, y, z, heading), radius, points);
-}
-
-void Perl__SpawnGrid(uint32 npc_id, float x, float y, float z, float heading, float spacing, uint32 spawn_count)
-{
-	quest_manager.SpawnGrid(npc_id, glm::vec4(x, y, z, heading), spacing, spawn_count);
-}
-
 void perl_register_quest()
 {
 	perl::interpreter perl(PERL_GET_THX);
@@ -6297,8 +6287,6 @@ void perl_register_quest()
 	package.add("SendMail", &Perl__SendMail);
 	package.add("SetAutoLoginCharacterNameByAccountID", &Perl__SetAutoLoginCharacterNameByAccountID);
 	package.add("SetRunning", &Perl__SetRunning);
-	package.add("SpawnCircle", &Perl__SpawnCircle);
-	package.add("SpawnGrid", &Perl__SpawnGrid);
 	package.add("activespeakactivity", &Perl__activespeakactivity);
 	package.add("activespeaktask", &Perl__activespeaktask);
 	package.add("activetasksinset", &Perl__activetasksinset);
@@ -21,8 +21,6 @@ Eglin
 #include <perlbind/perlbind.h>
 namespace perl = perlbind;

-#undef connect
-#undef bind
 #undef Null

 #ifdef WIN32
@@ -1817,13 +1817,25 @@ void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee)
 		if (parse->PlayerHasQuestSub(EVENT_DUEL_WIN)) {
 			std::vector<std::any> args = { winner, loser };

-			parse->EventPlayer(EVENT_DUEL_WIN, winner->CastToClient(), loser->GetName(), loser->CastToClient()->CharacterID(), &args);
+			parse->EventPlayer(
+				EVENT_DUEL_WIN,
+				winner->CastToClient(),
+				loser->GetName(),
+				loser->CastToClient()->CharacterID(),
+				&args
+			);
 		}

 		if (parse->PlayerHasQuestSub(EVENT_DUEL_LOSE)) {
 			std::vector<std::any> args = { winner, loser };

-			parse->EventPlayer(EVENT_DUEL_LOSE, loser->CastToClient(), winner->GetName(), winner->CastToClient()->CharacterID(), &args);
+			parse->EventPlayer(
+				EVENT_DUEL_LOSE,
+				loser->CastToClient(),
+				winner->GetName(),
+				winner->CastToClient()->CharacterID(),
+				&args
+			);
 		}
 	}

@@ -2933,22 +2945,8 @@ void EntityList::RemoveAuraFromMobs(Mob *aura)
 // entity list (zone wide)
 void EntityList::ScanCloseMobs(Mob *scanning_mob)
 {
-	if (!scanning_mob) {
-		return;
-	}
-
-	if (scanning_mob->GetID() <= 0) {
-		return;
-	}
-
 	float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);

-	// Reserve memory in m_close_mobs to avoid frequent re-allocations if not already reserved.
-	// Assuming mob_list.size() as an upper bound for reservation.
-	if (scanning_mob->m_close_mobs.bucket_count() < mob_list.size()) {
-		scanning_mob->m_close_mobs.reserve(mob_list.size());
-	}
-
 	scanning_mob->m_close_mobs.clear();

 	for (auto &e : mob_list) {
@@ -2959,17 +2957,28 @@ void EntityList::ScanCloseMobs(Mob *scanning_mob)

 		float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
 		if (distance <= scan_range || mob->GetAggroRange() >= scan_range) {
-			// add mob to scanning_mob's close list and vice versa
-			// check if the mob is already in the close mobs list before inserting
-			if (mob->m_close_mobs.find(scanning_mob->GetID()) == mob->m_close_mobs.end()) {
-				mob->m_close_mobs[scanning_mob->GetID()] = scanning_mob;
+			scanning_mob->m_close_mobs.emplace(std::pair<uint16, Mob *>(mob->GetID(), mob));
+
+			// add self to other mobs close list
+			if (scanning_mob->GetID() > 0) {
+				bool has_mob = false;
+
+				for (auto &cm: mob->m_close_mobs) {
+					if (scanning_mob->GetID() == cm.first) {
+						has_mob = true;
+						break;
+					}
+				}
+
+				if (!has_mob) {
+					mob->m_close_mobs.insert(std::pair<uint16, Mob *>(scanning_mob->GetID(), scanning_mob));
+				}
 			}
-			scanning_mob->m_close_mobs[mob->GetID()] = mob;
 		}
 	}

-	LogAIScanClose(
-		"[{}] Scanning close list > list_size [{}] moving [{}]",
+	LogAIScanCloseDetail(
+		"[{}] Scanning Close List | list_size [{}] moving [{}]",
 		scanning_mob->GetCleanName(),
 		scanning_mob->m_close_mobs.size(),
 		scanning_mob->IsMoving() ? "true" : "false"
@@ -2,21 +2,31 @@

 void command_emptyinventory(Client *c, const Seperator *sep)
 {
-	Client* t = c;
+	auto target = c;
 	if (c->GetGM() && c->GetTarget() && c->GetTarget()->IsClient()) {
-		t = c->GetTarget()->CastToClient();
+		target = c->GetTarget()->CastToClient();
 	}

 	EQ::ItemInstance *item = nullptr;
-	uint32 removed_count = 0;
-
-	for (const int16& slot_id : t->GetInventorySlots()) {
-		item = t->GetInv().GetItem(slot_id);
-
-		if (item) {
-			uint32 stack_size = std::max(static_cast<uint32>(item->GetCharges()), static_cast<uint32>(1));
-			removed_count += stack_size;
-			t->DeleteItemInInventory(slot_id, 0, true);
+	static const int16 slots[][2] = {
+		{ EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END },
+		{ EQ::invbag::GENERAL_BAGS_BEGIN, EQ::invbag::GENERAL_BAGS_END },
+		{ EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END},
+		{ EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END },
+		{ EQ::invbag::BANK_BAGS_BEGIN, EQ::invbag::BANK_BAGS_END },
+		{ EQ::invslot::SHARED_BANK_BEGIN, EQ::invslot::SHARED_BANK_END },
+		{ EQ::invbag::SHARED_BANK_BAGS_BEGIN, EQ::invbag::SHARED_BANK_BAGS_END },
+	};
+	int removed_count = 0;
+	const size_t size = sizeof(slots) / sizeof(slots[0]);
+	for (int slot_index = 0; slot_index < size; ++slot_index) {
+		for (int slot_id = slots[slot_index][0]; slot_id <= slots[slot_index][1]; ++slot_id) {
+			item = target->GetInv().GetItem(slot_id);
+			if (item) {
+				int stack_size = std::max(static_cast<int>(item->GetCharges()), 1);
+				removed_count += stack_size;
+				target->DeleteItemInInventory(slot_id, 0, true);
+			}
 		}
 	}

@@ -25,8 +35,8 @@ void command_emptyinventory(Client *c, const Seperator *sep)
 			Chat::White,
 			fmt::format(
 				"{} {} no items to delete.",
-				c->GetTargetDescription(t, TargetDescriptionType::UCYou),
-				c == t ? "have" : "has"
+				c->GetTargetDescription(target, TargetDescriptionType::UCYou),
+				c == target ? "have" : "has"
 			).c_str()
 		);
 		return;
@@ -36,9 +46,9 @@ void command_emptyinventory(Client *c, const Seperator *sep)
 		Chat::White,
 		fmt::format(
 			"Inventory cleared for {}, {} item{} deleted.",
-			c->GetTargetDescription(t),
+			c->GetTargetDescription(target),
 			removed_count,
 			removed_count != 1 ? "s" : ""
 		).c_str()
 	);
-}
+}
@@ -1,7 +1,6 @@
 #include "../client.h"
 #include "find/aa.cpp"
 #include "find/body_type.cpp"
-#include "find/bot.cpp"
 #include "find/bug_category.cpp"
 #include "find/character.cpp"
 #include "find/class.cpp"
@@ -12,7 +11,6 @@
 #include "find/faction.cpp"
 #include "find/item.cpp"
 #include "find/language.cpp"
-#include "find/ldon_theme.cpp"
 #include "find/npctype.cpp"
 #include "find/object_type.cpp"
 #include "find/race.cpp"
@@ -49,7 +47,6 @@ void command_find(Client *c, const Seperator *sep)
 		Cmd{.cmd = "faction", .u = "faction [Search Criteria]", .fn = FindFaction, .a = {"#findfaction"}},
 		Cmd{.cmd = "item", .u = "item [Search Criteria]", .fn = FindItem, .a = {"#fi", "#finditem"}},
 		Cmd{.cmd = "language", .u = "language [Search Criteria]", .fn = FindLanguage, .a = {"#findlanguage"}},
-		Cmd{.cmd = "ldon_theme", .u = "ldon_theme [Search Criteria]", .fn = FindLDoNTheme, .a = {"#findldontheme"}},
 		Cmd{
 			.cmd = "npctype", .u = "npctype [Search Criteria]", .fn = FindNPCType, .a = {
 				"#fn",
@@ -68,16 +65,6 @@ void command_find(Client *c, const Seperator *sep)
 		Cmd{.cmd = "zone", .u = "zone [Search Criteria]", .fn = FindZone, .a = {"#fz", "#findzone"}},
 	};

-	if (RuleB(Bots, Enabled)) {
-		commands.emplace_back(
-			Cmd{.cmd = "bot", .u = "bot [Search Criteria]", .fn = FindBot, .a = {"#findbot"}}
-		);
-	
-		std::sort(commands.begin(), commands.end(), [](const Cmd& a, const Cmd& b) {
-			return a.cmd < b.cmd;
-		});
-	}
-
 	// Check for arguments
 	const auto arguments = sep->argnum;
 	if (!arguments) {
@@ -1,95 +0,0 @@
-#include "../../client.h"
-#include "../../common/repositories/bot_data_repository.h"
-
-void FindBot(Client *c, const Seperator *sep)
-{
-	if (sep->IsNumber(2)) {
-		const auto bot_id = Strings::ToUnsignedInt(sep->arg[2]);
-
-		const auto& e = BotDataRepository::FindOne(content_db, bot_id);
-		if (!e.bot_id) {
-			c->Message(
-				Chat::White,
-				fmt::format(
-					"Bot ID {} does not exist or is invalid.",
-					bot_id
-				).c_str()
-			);
-
-			return;
-		}
-
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"Bot ID {} | {}",
-				bot_id,
-				e.name
-			).c_str()
-		);
-
-		return;
-	}
-
-	const auto search_criteria = Strings::ToLower(sep->argplus[2]);
-
-	const auto& l = BotDataRepository::GetWhere(
-		content_db,
-		fmt::format(
-			"LOWER(`name`) LIKE '%%{}%%' AND `name` NOT LIKE '%-deleted-%' ORDER BY `bot_id` ASC LIMIT 50",
-			search_criteria
-		)
-	);
-
-	if (l.empty()) {
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"No bots found matching '{}'.",
-				sep->argplus[2]
-			).c_str()
-		);
-	}
-
-	auto found_count = 0;
-
-	for (const auto& e : l) {
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"Bot ID {} | {}",
-				Strings::Commify(e.bot_id),
-				e.name
-			).c_str()
-		);
-
-		found_count++;
-
-		if (found_count == 50) {
-			break;
-		}
-	}
-
-	if (found_count == 50) {
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"50 Bots found matching '{}', max reached.",
-				sep->argplus[2]
-			).c_str()
-		);
-
-		return;
-	}
-
-	c->Message(
-		Chat::White,
-		fmt::format(
-			"{} Bot{} found matching '{}'.",
-			found_count,
-			found_count != 1 ? "s" : "",
-			sep->argplus[2]
-		).c_str()
-	);
-}
-
@@ -36,7 +36,7 @@ void FindCharacter(Client *c, const Seperator *sep)
 	const auto& l = CharacterDataRepository::GetWhere(
 		content_db,
 		fmt::format(
-			"LOWER(`name`) LIKE '%%{}%%' AND `name` NOT LIKE '%-deleted-%' ORDER BY `id` ASC LIMIT 50",
+			"LOWER(`name`) LIKE '%%{}%%' ORDER BY `id` ASC LIMIT 50",
 			search_criteria
 		)
 	);
@@ -57,7 +57,7 @@ void FindClass(Client *c, const Seperator *sep)
 				(
 					IsPlayerClass(class_id) ?
 					fmt::format(
-						" ({})",
+						" | ({})",
 						Strings::Commify(GetPlayerClassBit(class_id))
 					) :
 					""
@@ -1,65 +0,0 @@
-#include "../../client.h"
-
-void FindLDoNTheme(Client *c, const Seperator *sep)
-{
-	if (sep->IsNumber(2)) {
-		const uint32 theme_id = Strings::ToUnsignedInt(sep->arg[2]);
-		if (LDoNTheme::IsValid(theme_id)) {
-			c->Message(
-				Chat::White,
-				fmt::format(
-					"Theme {} | {} ({})",
-					theme_id,
-					LDoNTheme::GetName(theme_id),
-					LDoNTheme::GetBitmask(theme_id)
-				).c_str()
-			);
-
-			return;
-		}
-
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"Theme ID {} was not found.",
-				theme_id
-			).c_str()
-		);
-
-		return;
-	}
-
-	const std::string& search_criteria = Strings::ToLower(sep->argplus[2]);
-
-	uint32 found_count = 0;
-
-	for (const auto& l : ldon_theme_names) {
-		const std::string& ldon_theme_name_lower = Strings::ToLower(l.second.first);
-		if (!Strings::Contains(ldon_theme_name_lower, search_criteria)) {
-			continue;
-		}
-
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"Theme {} | {} ({})",
-				l.first,
-				l.second.first,
-				l.second.second
-			).c_str()
-		);
-
-		found_count++;
-	}
-
-	c->Message(
-		Chat::White,
-		fmt::format(
-			"{} Theme{} found matching '{}'.",
-			found_count,
-			found_count != 1 ? "s" : "",
-			sep->argplus[2]
-		).c_str()
-	);
-}
-
@@ -3,21 +3,20 @@

 void SetAdventurePoints(Client *c, const Seperator *sep)
 {
-	const uint16 arguments = sep->argnum;
+	const auto arguments = sep->argnum;
 	if (arguments < 3 || !sep->IsNumber(2) || !sep->IsNumber(3)) {
 		c->Message(Chat::White, "Usage: #set adventure_points [Theme] [Points]");

 		c->Message(Chat::White, "Valid themes are as follows:");

-		for (const auto& e : ldon_theme_names) {
-			if (e.first != LDoNTheme::Unused) {
+		for (const auto& e : EQ::constants::GetLDoNThemeMap()) {
+			if (e.first != LDoNThemes::Unused) {
 				c->Message(
 					Chat::White,
 					fmt::format(
-						"Theme {} | {} ({})",
+						"Theme {} | {}",
 						e.first,
-						e.second.first,
-						e.second.second
+						e.second
 					).c_str()
 				);
 			}
@@ -26,26 +25,25 @@ void SetAdventurePoints(Client *c, const Seperator *sep)
 		return;
 	}

-	Client* t = c;
+	auto t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient()) {
 		t = c->GetTarget()->CastToClient();
 	}

 	const uint32 theme_id = Strings::ToUnsignedInt(sep->arg[2]);
-	const uint32 points   = Strings::ToUnsignedInt(sep->arg[3]);
+	const uint32 points = Strings::ToUnsignedInt(sep->arg[3]);

-	if (!LDoNTheme::IsValid(theme_id)) {
+	if (!EQ::ValueWithin(theme_id, LDoNThemes::GUK, LDoNThemes::TAK)) {
 		c->Message(Chat::White, "Valid themes are as follows:");

-		for (const auto& e : ldon_theme_names) {
-			if (e.first != LDoNTheme::Unused) {
+		for (const auto& e : EQ::constants::GetLDoNThemeMap()) {
+			if (e.first != LDoNThemes::Unused) {
 				c->Message(
 					Chat::White,
 					fmt::format(
-						"Theme {} | {} ({})",
+						"Theme {} | {}",
 						e.first,
-						e.second.first,
-						e.second.second
+						e.second
 					).c_str()
 				);
 			}
@@ -58,7 +56,7 @@ void SetAdventurePoints(Client *c, const Seperator *sep)
 		Chat::White,
 		fmt::format(
 			"Set {} Points to {} for {}.",
-			LDoNTheme::GetName(theme_id),
+			EQ::constants::GetLDoNThemeName(theme_id),
 			Strings::Commify(points),
 			c->GetTargetDescription(t)
 		).c_str()
@@ -89,11 +89,11 @@ void ShowCurrencies(Client *c, const Seperator *sep)
 		}
 	}

-	for (const auto& l : ldon_theme_names) {
+	for (const auto& l : EQ::constants::GetLDoNThemeMap()) {
 		const uint32 ldon_currency_value = t->GetLDoNPointsTheme(l.first);
 		if (ldon_currency_value) {
 			currency_table += DialogueWindow::TableRow(
-				DialogueWindow::TableCell(l.second.first) +
+				DialogueWindow::TableCell(l.second) +
 				DialogueWindow::TableCell(Strings::Commify(ldon_currency_value))
 			);

@@ -2419,7 +2419,7 @@ bool Group::AmIMainAssist(const char *mob_name)
 	if (!mob_name)
 		return false;

-	return !((bool)MainAssistName.compare(mob_name));
+	return !((bool)MainTankName.compare(mob_name));
 }

 bool Group::AmIPuller(const char *mob_name)
@@ -63,6 +63,7 @@ public:
 	void	AddMember(const std::string& new_member_name);
 	void	SendUpdate(uint32 type,Mob* member);
 	void	SendLeadershipAAUpdate();
+	void	SendWorldGroup(uint32 zone_id,Mob* zoningmember);
 	bool	DelMemberOOZ(const char *Name);
 	bool	DelMember(Mob* oldmember,bool ignoresender = false);
 	void	DisbandGroup(bool joinraid = false);
@@ -72,6 +73,7 @@ public:
 	bool	IsGroupMember(Mob* c);
 	bool	IsGroupMember(const char* name);
 	bool	Process();
+	bool	IsGroup()			{ return true; }
 	void	SendGroupJoinOOZ(Mob* NewMember);
 	void	CastGroupSpell(Mob* caster,uint16 spellid);
 	void	SplitExp(ExpSource exp_source, const uint64 exp, Mob* other);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
KimLS	0c87af7d6b	Decompress wont default to false	2024-10-18 17:32:55 -07:00
KimLS	2e087cde5b	Force add stream_parser.sln	2024-10-18 17:23:12 -07:00
KimLS	d1c7c00f19	Binary dumping; not yet implemented	2024-10-18 15:49:49 -07:00
KimLS	999ccdcb19	Add experimental decompression support.	2024-10-17 22:53:33 -07:00
KimLS	d3cd037fa7	Fix for broken AppCombined; both logic error and bad enum doh	2024-10-17 20:12:33 -07:00
KimLS	dc1509e768	update from 6LTS to 8LTS because 6 goes out of support in november.	2024-10-16 23:08:33 -07:00
KimLS	124b9c7abe	Update packages	2024-10-16 23:07:30 -07:00
KimLS	534de0c414	Add my stream parser to utils, simple probably could use some work.	2024-10-16 23:04:10 -07:00