[Release] 22.61.0 (#4587)

* [Cleanup] Fix GM Flag Spell Restriction Bypasses

* Update spells.cpp

CHANGELOG.md

@@ -1,3 +1,68 @@
+## [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

CMakeLists.txt

@@ -37,6 +37,9 @@ 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)

common/CMakeLists.txt

@@ -112,8 +112,6 @@ SET(common_sources
     net/websocket_server.cpp
     net/websocket_server_connection.cpp
     patches/patches.cpp
-	patches/laurion.cpp
-    patches/laurion_limits.cpp
     patches/sod.cpp
     patches/sod_limits.cpp
     patches/sof.cpp
@@ -657,11 +655,7 @@ SET(common_headers
     net/websocket_server.h
     net/websocket_server_connection.h
     patches/patches.h
-    patches/laurion.h
-    patches/laurion_limits.h
-    patches/laurion_ops.h
-    patches/laurion_structs.h
-	patches/sod.h
+    patches/sod.h
     patches/sod_limits.h
     patches/sod_ops.h
     patches/sod_structs.h
@@ -747,10 +741,6 @@ SOURCE_GROUP(Net FILES
 
 SOURCE_GROUP(Patches FILES
     patches/patches.h
-	patches/laurion.h
-    patches/laurion_limits.h
-    patches/laurion_ops.h
-    patches/laurion_structs.h
     patches/sod.h
     patches/sod_limits.h
     patches/sod_ops.h
@@ -779,8 +769,6 @@ SOURCE_GROUP(Patches FILES
     patches/uf_ops.h
     patches/uf_structs.h
     patches/patches.cpp
-	patches/laurion.cpp
-    patches/laurion_limits.cpp
     patches/sod.cpp
     patches/sod_limits.cpp
     patches/sof.cpp

common/base_packet.h

@@ -59,7 +59,6 @@ public:
 	void WriteUInt8(uint8 value) { *(uint8 *)(pBuffer + _wpos) = value; _wpos += sizeof(uint8); }
 	void WriteUInt32(uint32 value) { *(uint32 *)(pBuffer + _wpos) = value; _wpos += sizeof(uint32); }
 	void WriteUInt64(uint64 value) { *(uint64 *)(pBuffer + _wpos) = value; _wpos += sizeof(uint64); }
-	void WriteSInt16(int32 value) { *(int16*)(pBuffer + _wpos) = value; _wpos += sizeof(int16); }
 	void WriteUInt16(uint32 value) { *(uint16 *)(pBuffer + _wpos) = value; _wpos += sizeof(uint16); }
 	void WriteSInt32(int32 value) { *(int32 *)(pBuffer + _wpos) = value; _wpos += sizeof(int32); }
 	void WriteFloat(float value) { *(float *)(pBuffer + _wpos) = value; _wpos += sizeof(float); }

common/bazaar.cpp

@@ -8,13 +8,14 @@ std::vector<BazaarSearchResultsFromDB_Struct>
 Bazaar::GetSearchResults(
 	SharedDatabase &db,
 	BazaarSearchCriteria_Struct search,
-	uint32 char_zone_id
+	uint32 char_zone_id,
+	int32 char_zone_instance_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 [{}]",
+		"search_scope [{}] char_zone_id [{}], char_zone_instance_id [{}]",
 		search.item_name,
 		search.min_cost,
 		search.max_cost,
@@ -26,7 +27,8 @@ Bazaar::GetSearchResults(
 		search.trader_entity_id,
 		search.trader_id,
 		search.search_scope,
-		char_zone_id
+		char_zone_id,
+		char_zone_instance_id
 	);
 
 	std::string search_criteria_trader("TRUE ");
@@ -34,14 +36,19 @@ 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_entity_id = {} AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
 				search.trader_entity_id,
-				Zones::BAZAAR
+				Zones::BAZAAR,
+				char_zone_instance_id
 			)
 		);
 	}
 	else if (search.search_scope == Local_Scope) {
-		search_criteria_trader.append(fmt::format(" AND trader.char_zone_id = {}", char_zone_id));
+		search_criteria_trader.append(fmt::format(
+			" AND trader.char_zone_id = {} AND trader.char_zone_instance_id = {}",
+			char_zone_id,
+			char_zone_instance_id)
+		);
 	}
 	else if (search.trader_id > 0) {
 		search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
@@ -62,7 +69,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 "
+		"aug_slot_1, aug_slot_2, aug_slot_3, aug_slot_4, aug_slot_5, aug_slot_6, trader.char_zone_instance_id "
 		"FROM trader, character_data "
 		"WHERE {} AND trader.char_id = character_data.id "
 		"GROUP BY trader.item_sn, trader.item_charges, trader.char_id",
@@ -122,19 +129,20 @@ 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_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_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());
 
 		LogTradingDetail(
 			"Searching against item [{}] ({}) for trader [{}]",

common/bazaar.h

@@ -7,7 +7,7 @@
 class Bazaar {
 public:
 	static std::vector<BazaarSearchResultsFromDB_Struct>
-	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id);
+	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id, int char_zone_instance_id);
 };
 
 

common/classes.h

@@ -71,9 +71,6 @@ namespace Class {
 	constexpr uint8 FellowshipMaster          = 69;
 	constexpr uint8 AlternateCurrencyMerchant = 70;
 	constexpr uint8 MercenaryLiaison          = 71;
-	constexpr uint8 RealEstateMerchant        = 72;
-	constexpr uint8 LoyaltyMerchant           = 73;
-	constexpr uint8 TributeMaster2            = 74;
 
 	constexpr uint8  PLAYER_CLASS_COUNT  = 16;
 	constexpr uint16 ALL_CLASSES_BITMASK = 65535;

common/crash.cpp

@@ -294,6 +294,8 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}
 
+	LogSys.CloseFileLogs();
+
 	exit(1);
 }
 

common/crc32.cpp

@@ -101,24 +101,6 @@ void CRC32::SetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at)
 	memcpy(in_data, (char*)&check, 4);
 }
 
-unsigned long CRC32::GetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at)
-{
-	unsigned long data;
-	unsigned long check = 0xffffffff;
-
-	for (uint32 i = start_at; i < in_length; i++)
-	{
-		data = in_data[i];
-		data = data ^ (check);
-		data = data & 0x000000ff;
-		check = check >> 8;
-		data = CRC32Table[data];
-		check = check ^ data;
-	}
-
-	return check;
-}
-
 uint32 CRC32::Update(const uint8* buf, uint32 bufsize, uint32 crc32var) {
 	for(uint32 i=0; i < bufsize; i++)
 		Calc(buf[i], crc32var);

common/crc32.h

@@ -8,7 +8,6 @@ public:
 	static uint32			Generate(const uint8* buf, uint32 bufsize);
 	static uint32			GenerateNoFlip(const uint8* buf, uint32 bufsize); // Same as Generate(), but without the ~
 	static void				SetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at=4);
-	static unsigned long	GetEQChecksum(uchar* in_data, uint32 in_length, uint32 start_at = 4);
 
 	// Multiple buffer CRC32
 	static uint32			Update(const uint8* buf, uint32 bufsize, uint32 crc32 = 0xFFFFFFFF);

common/database.cpp

@@ -1860,7 +1860,35 @@ bool Database::CopyCharacter(
 
 	const int64 new_character_id = (CharacterDataRepository::GetMaxId(*this) + 1);
 
-	std::vector<std::string> tables_to_zero_id = { "keyring", "data_buckets", "character_instance_safereturns" };
+	// 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;
 
 	TransactionBegin();
 
@@ -1868,6 +1896,10 @@ 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 {}",
@@ -1918,6 +1950,10 @@ bool Database::CopyCharacter(
 					value = std::to_string(destination_account_id);
 				}
 
+				if (!Strings::IsNumber(value)) {
+					value = Strings::Escape(value);
+				}
+
 				new_values.emplace_back(value);
 			}
 
@@ -1950,6 +1986,11 @@ 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;
@@ -1959,6 +2000,13 @@ bool Database::CopyCharacter(
 
 	TransactionCommit();
 
+	LogInfo(
+		"Character [{}] copied to [{}] total rows [{}]",
+		source_character_name,
+		destination_character_name,
+		Strings::Commify(total_rows_copied)
+	);
+
 	return true;
 }
 

common/database/database_update_manifest.cpp

@@ -5770,6 +5770,17 @@ MODIFY COLUMN `exp_modifier` float NOT NULL DEFAULT 1.0 AFTER `aa_modifier`;
 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

common/emu_constants.cpp

@@ -140,29 +140,6 @@ 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 = {
@@ -459,3 +436,18 @@ 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();
+}

common/emu_constants.h

@@ -352,9 +352,6 @@ 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);
 
@@ -751,6 +748,35 @@ 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;

common/emu_oplist.h

@@ -1,6 +1,8 @@
 // system use
 N(OP_ExploreUnknown),
 // start (please add new opcodes in descending order and re-order any name changes where applicable)
+N(OP_0x0193),
+N(OP_0x0347),
 N(OP_AAAction),
 N(OP_AAExpUpdate),
 N(OP_AcceptNewTask),
@@ -354,7 +356,6 @@ N(OP_MercenaryTimer),
 N(OP_MercenaryTimerRequest),
 N(OP_MercenaryUnknown1),
 N(OP_MercenaryUnsuspendResponse),
-N(OP_MerchantBulkItems),
 N(OP_MobEnduranceUpdate),
 N(OP_MobHealth),
 N(OP_MobManaUpdate),
@@ -373,7 +374,6 @@ N(OP_MultiLineMsg),
 N(OP_NewSpawn),
 N(OP_NewTitlesAvailable),
 N(OP_NewZone),
-N(OP_NPCMoveUpdate),
 N(OP_OnLevelMessage),
 N(OP_OpenContainer),
 N(OP_OpenDiscordMerchant),

common/emu_versions.cpp

@@ -56,8 +56,6 @@ const char* EQ::versions::ClientVersionName(ClientVersion client_version)
 		return "RoF";
 	case ClientVersion::RoF2:
 		return "RoF2";
-	case ClientVersion::Laurion:
-		return "Laurion";
 	default:
 		return "Invalid Version";
 	};
@@ -78,8 +76,6 @@ uint32 EQ::versions::ConvertClientVersionToClientVersionBit(ClientVersion client
 		return bitRoF;
 	case ClientVersion::RoF2:
 		return bitRoF2;
-	case ClientVersion::Laurion:
-		return bitLaurion;
 	default:
 		return bitUnknown;
 	}
@@ -100,8 +96,6 @@ EQ::versions::ClientVersion EQ::versions::ConvertClientVersionBitToClientVersion
 		return ClientVersion::RoF;
 	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::RoF2) - 1)) :
 		return ClientVersion::RoF2;
-	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Laurion) - 1)):
-		return ClientVersion::Laurion;
 	default:
 		return ClientVersion::Unknown;
 	}
@@ -190,8 +184,6 @@ const char* EQ::versions::MobVersionName(MobVersion mob_version)
 		return "RoF";
 	case MobVersion::RoF2:
 		return "RoF2";
-	case MobVersion::Laurion:
-		return "Laurion";
 	case MobVersion::NPC:
 		return "NPC";
 	case MobVersion::NPCMerchant:
@@ -220,8 +212,6 @@ const char* EQ::versions::MobVersionName(MobVersion mob_version)
 		return "Offline RoF";
 	case MobVersion::OfflineRoF2:
 		return "Offline RoF2";
-	case MobVersion::OfflineLaurion:
-		return "Offline Laurion";
 	default:
 		return "Invalid Version";
 	};
@@ -245,8 +235,6 @@ EQ::versions::ClientVersion EQ::versions::ConvertMobVersionToClientVersion(MobVe
 		return ClientVersion::RoF;
 	case MobVersion::RoF2:
 		return ClientVersion::RoF2;
-	case MobVersion::Laurion:
-		return ClientVersion::Laurion;
 	default:
 		return ClientVersion::Unknown;
 	}
@@ -270,8 +258,6 @@ EQ::versions::MobVersion EQ::versions::ConvertClientVersionToMobVersion(ClientVe
 		return MobVersion::RoF;
 	case ClientVersion::RoF2:
 		return MobVersion::RoF2;
-	case ClientVersion::Laurion:
-		return MobVersion::Laurion;
 	default:
 		return MobVersion::Unknown;
 	}
@@ -292,8 +278,6 @@ EQ::versions::MobVersion EQ::versions::ConvertPCMobVersionToOfflinePCMobVersion(
 		return MobVersion::OfflineRoF;
 	case MobVersion::RoF2:
 		return MobVersion::OfflineRoF2;
-	case MobVersion::Laurion:
-		return MobVersion::OfflineLaurion;
 	default:
 		return MobVersion::Unknown;
 	}
@@ -314,8 +298,6 @@ EQ::versions::MobVersion EQ::versions::ConvertOfflinePCMobVersionToPCMobVersion(
 		return MobVersion::RoF;
 	case MobVersion::OfflineRoF2:
 		return MobVersion::RoF2;
-	case MobVersion::OfflineLaurion:
-		return MobVersion::Laurion;
 	default:
 		return MobVersion::Unknown;
 	}
@@ -336,8 +318,6 @@ EQ::versions::ClientVersion EQ::versions::ConvertOfflinePCMobVersionToClientVers
 		return ClientVersion::RoF;
 	case MobVersion::OfflineRoF2:
 		return ClientVersion::RoF2;
-	case MobVersion::OfflineLaurion:
-		return ClientVersion::Laurion;
 	default:
 		return ClientVersion::Unknown;
 	}
@@ -358,8 +338,6 @@ EQ::versions::MobVersion EQ::versions::ConvertClientVersionToOfflinePCMobVersion
 		return MobVersion::OfflineRoF;
 	case ClientVersion::RoF2:
 		return MobVersion::OfflineRoF2;
-	case ClientVersion::Laurion:
-		return MobVersion::OfflineLaurion;
 	default:
 		return MobVersion::Unknown;
 	}
@@ -410,27 +388,6 @@ const char* EQ::expansions::ExpansionName(Expansion expansion)
 		return "Rain of Fear";
 	case Expansion::CotF:
 		return "Call of the Forsaken";
-	case Expansion::TDS:
-		return "The Darkened Sea";
-	case Expansion::TBM:
-		return "The Broken Mirror";
-	case Expansion::EoK:
-		return "Empires of Kunark";
-	case Expansion::RoS:
-		return "Ring of Scale";
-	case Expansion::TBL:
-		return "The Burning Lands";
-	case Expansion::ToV:
-		return "Torment of Velious";
-	case Expansion::CoV:
-		return "Claws of Veeshan";
-	case Expansion::ToL:
-		return "Terror of Luclin";
-	case Expansion::NoS:
-		return "Night of Shadows";
-	case Expansion::LS:
-		return "Laurion's Song";
-
 	default:
 		return "Invalid Expansion";
 	}
@@ -484,26 +441,6 @@ uint32 EQ::expansions::ConvertExpansionToExpansionBit(Expansion expansion)
 		return bitRoF;
 	case Expansion::CotF:
 		return bitCotF;
-	case Expansion::TDS:
-		return bitTDS;
-	case Expansion::TBM:
-		return bitTBM;
-	case Expansion::EoK:
-		return bitEoK;
-	case Expansion::RoS:
-		return bitRoS;
-	case Expansion::TBL:
-		return bitTBL;
-	case Expansion::ToV:
-		return bitToV;
-	case Expansion::CoV:
-		return bitCoV;
-	case Expansion::ToL:
-		return bitToL;
-	case Expansion::NoS:
-		return bitNoS;
-	case Expansion::LS:
-		return bitLS;
 	default:
 		return bitEverQuest;
 	}
@@ -552,26 +489,6 @@ EQ::expansions::Expansion EQ::expansions::ConvertExpansionBitToExpansion(uint32
 		return Expansion::RoF;
 	case bitCotF:
 		return Expansion::CotF;
-	case bitTDS:
-		return Expansion::TDS;
-	case bitTBM:
-		return Expansion::TBM;
-	case bitEoK:
-		return Expansion::EoK;
-	case bitRoS:
-		return Expansion::RoS;
-	case bitTBL:
-		return Expansion::TBL;
-	case bitToV:
-		return Expansion::ToV;
-	case bitCoV:
-		return Expansion::CoV;
-	case bitToL:
-		return Expansion::ToL;
-	case bitNoS:
-		return Expansion::NoS;
-	case bitLS:
-		return Expansion::LS;
 	default:
 		return Expansion::EverQuest;
 	}
@@ -620,26 +537,6 @@ uint32 EQ::expansions::ConvertExpansionToExpansionsMask(Expansion expansion)
 		return maskRoF;
 	case Expansion::CotF:
 		return maskCotF;
-	case Expansion::TDS:
-		return maskTDS;
-	case Expansion::TBM:
-		return maskTBM;
-	case Expansion::EoK:
-		return maskEoK;
-	case Expansion::RoS:
-		return maskRoS;
-	case Expansion::TBL:
-		return maskTBL;
-	case Expansion::ToV:
-		return maskToV;
-	case Expansion::CoV:
-		return maskCoV;
-	case Expansion::ToL:
-		return maskToL;
-	case Expansion::NoS:
-		return maskNoS;
-	case Expansion::LS:
-		return maskLS;
 	default:
 		return maskEverQuest;
 	}

common/emu_versions.h

@@ -36,8 +36,7 @@ namespace EQ
 			SoD,		// Build: 'Dec 19 2008 15:22:49'
 			UF,			// Build: 'Jun  8 2010 16:44:32'
 			RoF,		// Build: 'Dec 10 2012 17:35:44'
-			RoF2,		// Build: 'May 10 2013 23:30:08'
-			Laurion
+			RoF2		// Build: 'May 10 2013 23:30:08'
 		};
 
 		enum ClientVersionBitmask : uint32 {
@@ -49,7 +48,6 @@ namespace EQ
 			bitUF = 0x00000010,
 			bitRoF = 0x00000020,
 			bitRoF2 = 0x00000040,
-			bitLaurion = 0x00000080,
 			maskUnknown = 0x00000000,
 			maskTitaniumAndEarlier = 0x00000003,
 			maskSoFAndEarlier = 0x00000007,
@@ -61,11 +59,10 @@ namespace EQ
 			maskUFAndLater = 0xFFFFFFF0,
 			maskRoFAndLater = 0xFFFFFFE0,
 			maskRoF2AndLater = 0xFFFFFFC0,
-			maskLaurionAndLater = 0xFFFFFF80,
 			maskAllClients = 0xFFFFFFFF
 		};
 
-		const ClientVersion LastClientVersion = ClientVersion::Laurion;
+		const ClientVersion LastClientVersion = ClientVersion::RoF2;
 		const size_t ClientVersionCount = (static_cast<size_t>(LastClientVersion) + 1);
 
 		bool IsValidClientVersion(ClientVersion client_version);
@@ -83,7 +80,6 @@ namespace EQ
 			UF,
 			RoF,
 			RoF2,
-			Laurion,
 			NPC,
 			NPCMerchant,
 			Merc,
@@ -97,14 +93,13 @@ namespace EQ
 			OfflineSoD,
 			OfflineUF,
 			OfflineRoF,
-			OfflineRoF2,
-			OfflineLaurion
+			OfflineRoF2
 		};
 
-		const MobVersion LastMobVersion = MobVersion::OfflineLaurion;
-		const MobVersion LastPCMobVersion = MobVersion::Laurion;
+		const MobVersion LastMobVersion = MobVersion::OfflineRoF2;
+		const MobVersion LastPCMobVersion = MobVersion::RoF2;
 		const MobVersion LastNonPCMobVersion = MobVersion::BotPet;
-		const MobVersion LastOfflinePCMobVersion = MobVersion::OfflineLaurion;
+		const MobVersion LastOfflinePCMobVersion = MobVersion::OfflineRoF2;
 		const size_t MobVersionCount = (static_cast<size_t>(LastMobVersion) + 1);
 
 		bool IsValidMobVersion(MobVersion mob_version);
@@ -136,8 +131,7 @@ namespace EQ
 			ucsSoDCombined = 'D',
 			ucsUFCombined = 'E',
 			ucsRoFCombined = 'F',
-			ucsRoF2Combined = 'G',
-			ucsLaurionCombined = 'G'
+			ucsRoF2Combined = 'G'
 		};
 
 	} /*versions*/
@@ -164,17 +158,7 @@ namespace EQ
 			HoT,
 			VoA,
 			RoF,
-			CotF,
-			TDS,
-			TBM,
-			EoK,
-			RoS,
-			TBL,
-			ToV,
-			CoV,
-			ToL,
-			NoS,
-			LS
+			CotF
 		};
 
 		enum ExpansionBitmask : uint32 {
@@ -199,16 +183,6 @@ namespace EQ
 			bitVoA = 0x00020000,
 			bitRoF = 0x00040000,
 			bitCotF = 0x00080000,
-			bitTDS = 0x00100000,
-			bitTBM = 0x00200000,
-			bitEoK = 0x00400000,
-			bitRoS = 0x00800000,
-			bitTBL = 0x01000000,
-			bitToV = 0x02000000,
-			bitCoV = 0x04000000,
-			bitToL = 0x08000000,
-			bitNoS = 0x10000000,
-			bitLS = 0x20000000,
 			maskEverQuest = 0x00000000,
 			maskRoK = 0x00000001,
 			maskSoV = 0x00000003,
@@ -229,17 +203,7 @@ namespace EQ
 			maskHoT = 0x0001FFFF,
 			maskVoA = 0x0003FFFF,
 			maskRoF = 0x0007FFFF,
-			maskCotF = 0x000FFFFF,
-			maskTDS = 0x001FFFFF,
-			maskTBM = 0x003FFFFF,
-			maskEoK = 0x007FFFFF,
-			maskRoS = 0x00FFFFFF,
-			maskTBL = 0x01FFFFFF,
-			maskToV = 0x03FFFFFF,
-			maskCoV = 0x07FFFFFF,
-			maskToL = 0x0FFFFFFF,
-			maskNoS = 0x1FFFFFFF,
-			maskLS = 0x3FFFFFFF,
+			maskCotF = 0x000FFFFF
 		};
 
 		const char* ExpansionName(Expansion expansion);

common/eq_constants.h

@@ -762,46 +762,6 @@ typedef enum {
 	FilterStrikethrough = 26,	//0=show, 1=hide // RoF2 Confirmed
 	FilterStuns = 27,			//0=show, 1=hide // RoF2 Confirmed
 	FilterBardSongsOnPets = 28,	//0=show, 1=hide // RoF2 Confirmed
-	FilterSwarmPetDeath = 29,
-	FilterFellowshipChat = 30,
-	FilterMercenaryMessages = 31,
-	FilterSpam = 32,
-	FilterAchievements = 33,
-	FilterPvPMessages = 34,
-	FilterSpellNameInCast = 35,
-	FilterRandomMine = 36,
-	FilterRandomGroupRaid = 37,
-	FilterRandomOthers = 38,
-	FilterEnvironmentalDamage = 39,
-	FilterMessages = 40,
-	FilterOverwriteDetrimental = 41,
-	FilterOverwriteBeneficial = 42,
-	FilterCantUseCommand = 43,
-	FilterCombatAbilityReuse = 44,
-	FilterAAAbilityReuse = 45,
-	FilterProcBeginCasting = 46,
-	FilterDestroyedItems = 47,
-	FilterYourAuras = 48,
-	FilterOtherAuras = 49,
-	FilterYourHeals = 50,
-	FilterOtherHeals = 51,
-	FilterYourDoTs = 52,
-	FilterOtherDoTs = 53,
-	FilterOtherDirectDamage = 54,
-	FilterSpellEmotes = 55,
-	FilterFactionMessages = 56,
-	FilterTauntMessages = 57,
-	FilterYourDisciplines = 58,
-	FilterOtherDisplines = 59,
-	FilterAchievementsOthers = 60,
-	FilterRaidVictory = 61,
-	FilterOtherDirectDamageCrits = 62,
-	FilterDoTYoursCritical = 63,
-	FilterDoTOthersCritical = 64,
-	FilterDoTDamageTaken = 65,
-	FilterHealsReceived = 66,
-	FilterHealsYoursCritical = 67,
-	FilterHealsOthersCritical = 68,
 	_FilterCount
 } eqFilterType;
 
@@ -1033,24 +993,6 @@ 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,

common/eq_limits.cpp

@@ -104,14 +104,6 @@ static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::vers
 		RoF2::constants::EXPANSIONS_MASK,
 		RoF2::constants::CHARACTER_CREATION_LIMIT,
 		RoF2::constants::SAY_LINK_BODY_SIZE
-	),
-	/*[ClientVersion::Laurion] =*/
-	EQ::constants::LookupEntry(
-		Laurion::constants::EXPANSION,
-		Laurion::constants::EXPANSION_BIT,
-		Laurion::constants::EXPANSIONS_MASK,
-		Laurion::constants::CHARACTER_CREATION_LIMIT,
-		Laurion::constants::SAY_LINK_BODY_SIZE
 	)
 };
 
@@ -378,33 +370,6 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		RoF2::inventory::ConcatenateInvTypeLimbo,
 		RoF2::inventory::AllowOverLevelEquipment
 	),
-	/*[MobVersion::LS] =*/
-	EQ::inventory::LookupEntry(
-		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQ::invtype::POSSESSIONS_SIZE,	RoF2::invtype::BANK_SIZE,					RoF2::invtype::SHARED_BANK_SIZE,
-			RoF2::invtype::TRADE_SIZE,			RoF2::invtype::WORLD_SIZE,					RoF2::invtype::LIMBO_SIZE,
-			RoF2::invtype::TRIBUTE_SIZE,		RoF2::invtype::TROPHY_TRIBUTE_SIZE,			RoF2::invtype::GUILD_TRIBUTE_SIZE,
-			RoF2::invtype::MERCHANT_SIZE,		RoF2::invtype::DELETED_SIZE,				RoF2::invtype::CORPSE_SIZE,
-			RoF2::invtype::BAZAAR_SIZE,			RoF2::invtype::INSPECT_SIZE,				RoF2::invtype::REAL_ESTATE_SIZE,
-			RoF2::invtype::VIEW_MOD_PC_SIZE,	RoF2::invtype::VIEW_MOD_BANK_SIZE,			RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE,
-			RoF2::invtype::VIEW_MOD_LIMBO_SIZE,	RoF2::invtype::ALT_STORAGE_SIZE,			RoF2::invtype::ARCHIVED_SIZE,
-			RoF2::invtype::MAIL_SIZE,			RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE,	RoF2::invtype::KRONO_SIZE,
-			RoF2::invtype::OTHER_SIZE
-		),
-
-		RoF2::invslot::EQUIPMENT_BITMASK,
-		RoF2::invslot::GENERAL_BITMASK,
-		RoF2::invslot::CURSOR_BITMASK,
-		RoF2::invslot::POSSESSIONS_BITMASK,
-		RoF2::invslot::CORPSE_BITMASK,
-		RoF2::invbag::SLOT_COUNT,
-		RoF2::invaug::SOCKET_COUNT,
-
-		RoF2::inventory::AllowEmptyBagInBag,
-		RoF2::inventory::AllowClickCastFromBag,
-		RoF2::inventory::ConcatenateInvTypeLimbo,
-		RoF2::inventory::AllowOverLevelEquipment
-	),
 	/*[MobVersion::NPC] =*/
 	EQ::inventory::LookupEntry(
 		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
@@ -778,33 +743,6 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		RoF2::invbag::SLOT_COUNT,
 		RoF2::invaug::SOCKET_COUNT,
 
-		false,
-		false,
-		false,
-		false
-	),
-	/*[MobVersion::OfflineLS] =*/
-	EQ::inventory::LookupEntry(
-		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
-			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
-			RoF2::invtype::TRADE_SIZE,			RoF2::INULL,						RoF2::INULL,
-			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
-			RoF2::invtype::MERCHANT_SIZE,		RoF2::INULL,						RoF2::INULL,
-			RoF2::invtype::BAZAAR_SIZE,			RoF2::invtype::INSPECT_SIZE,		RoF2::INULL,
-			RoF2::invtype::VIEW_MOD_PC_SIZE,	RoF2::invtype::VIEW_MOD_BANK_SIZE,	RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE,
-			RoF2::invtype::VIEW_MOD_LIMBO_SIZE,	RoF2::INULL,						RoF2::INULL,
-			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
-			RoF2::INULL
-		),
-
-		RoF2::INULL,
-		RoF2::INULL,
-		RoF2::INULL,
-		RoF2::INULL,
-		RoF2::INULL,
-		RoF2::invbag::SLOT_COUNT,
-		RoF2::invaug::SOCKET_COUNT,
-
 		false,
 		false,
 		false,
@@ -1056,10 +994,6 @@ static const EQ::behavior::LookupEntry behavior_static_lookup_entries[EQ::versio
 	EQ::behavior::LookupEntry(
 		RoF2::behavior::CoinHasWeight
 	),
-	/*[MobVersion::LS] =*/
-	EQ::behavior::LookupEntry(
-		RoF2::behavior::CoinHasWeight
-	),
 	/*[MobVersion::NPC] =*/
 	EQ::behavior::LookupEntry(
 		EQ::behavior::CoinHasWeight
@@ -1113,10 +1047,6 @@ static const EQ::behavior::LookupEntry behavior_static_lookup_entries[EQ::versio
 		RoF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineRoF2] =*/
-	EQ::behavior::LookupEntry(
-		RoF2::behavior::CoinHasWeight
-	),
-	/*[MobVersion::OfflineLS] =*/
 	EQ::behavior::LookupEntry(
 		RoF2::behavior::CoinHasWeight
 	)
@@ -1272,19 +1202,6 @@ static const EQ::spells::LookupEntry spells_static_lookup_entries[EQ::versions::
 		RoF2::spells::NPC_BUFFS,
 		RoF2::spells::PET_BUFFS,
 		RoF2::spells::MERC_BUFFS
-	),
-	/*[ClientVersion::Laurion] =*/
-	EQ::spells::LookupEntry(
-		Laurion::spells::SPELL_ID_MAX,
-		Laurion::spells::SPELLBOOK_SIZE,
-		UF::spells::SPELL_GEM_COUNT, // client translators are setup to allow the max value a client supports..however, the top 4 indices are not valid in this case
-		Laurion::spells::LONG_BUFFS,
-		Laurion::spells::SHORT_BUFFS,
-		Laurion::spells::DISC_BUFFS,
-		Laurion::spells::TOTAL_BUFFS,
-		Laurion::spells::NPC_BUFFS,
-		Laurion::spells::PET_BUFFS,
-		Laurion::spells::MERC_BUFFS
 	)
 };
 

common/eq_limits.h

@@ -29,7 +29,7 @@
 #include "../common/patches/uf_limits.h"
 #include "../common/patches/rof_limits.h"
 #include "../common/patches/rof2_limits.h"
-#include "../common/patches/laurion_limits.h"
+
 
 namespace EQ
 {

common/eq_packet_structs.h

@@ -47,13 +47,6 @@ static const uint32 ADVANCED_LORE_LENGTH = 8192;
 */
 #pragma pack(1)
 
-struct EqGuid
-{
-	uint32_t Id;
-	uint16_t WorldId;
-	uint16_t Reserved;
-};
-
 struct LoginInfo_Struct {
 /*000*/	char	login_info[64];
 /*064*/	uint8	unknown064[124];
@@ -331,7 +324,6 @@ union
 	bool guild_show;
 	bool trader;
 	bool buyer;
-	EqGuid CharacterGuid;
 };
 
 struct PlayerState_Struct {
@@ -3750,7 +3742,8 @@ struct GetItems_Struct{
 
 struct BecomeTrader_Struct {
 	uint32 action;
-	uint32 zone_id;
+	uint16 zone_id;
+	uint16 zone_instance_id;
 	uint32 trader_id;
 	uint32 entity_id;
 	char   trader_name[64];
@@ -6355,6 +6348,7 @@ enum BazaarTraderBarterActions {
 	TraderAck2                   = 22,
 	AddTraderToBazaarWindow      = 24,
 	RemoveTraderFromBazaarWindow = 25,
+	FirstOpenSearch              = 26,
 	ClickTrader                  = 28,
 	DeliveryCostUpdate           = 29
 };
@@ -6394,6 +6388,7 @@ 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;
@@ -6415,6 +6410,7 @@ 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),

common/eqemu_config.h

@@ -137,9 +137,9 @@ class EQEmuConfig
 		{
 
 		}
-		virtual ~EQEmuConfig() {}
 
 	public:
+		virtual ~EQEmuConfig() {}
 
 		// Produce a const singleton
 		static const EQEmuConfig *get()

common/eqemu_logsys.cpp

@@ -25,6 +25,8 @@
 #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>
@@ -85,6 +87,7 @@ 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);
@@ -532,6 +535,11 @@ 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...
 	 */

common/inventory_profile.cpp

@@ -612,9 +612,9 @@ bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
 	return has_equipped;
 }
 
-int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
+uint32 EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 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;
 }
 
-int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
+uint32 EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 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;
-}
+}

common/inventory_profile.h

@@ -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
-		int CountItemEquippedByID(uint32 item_id);
+		uint32 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
-		int CountAugmentEquippedByID(uint32 item_id);
+		uint32 CountAugmentEquippedByID(uint32 item_id);
 
 		// Get a list of augments from a specific slot ID
 		std::vector<uint32> GetAugmentIDsBySlotID(int16 slot_id);

common/net/tcp_connection.cpp

@@ -80,6 +80,8 @@ void EQ::Net::TCPConnection::Start() {
 			}
 		}
 		else if (nread == UV_EOF) {
+			connection->Disconnect();
+
 			if (buf->base) {
 				delete[] buf->base;
 			}

common/patches/laurion.h

@@ -1,55 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef COMMON_LAURION_H
-#define COMMON_LAURION_H
-
-#include "../struct_strategy.h"
-
-class EQStreamIdentifier;
-
-namespace Laurion
-{
-
-	//these are the only public member of this namespace.
-	extern void Register(EQStreamIdentifier& into);
-	extern void Reload();
-
-
-
-	//you should not directly access anything below..
-	//I just dont feel like making a seperate header for it.
-
-	class Strategy : public StructStrategy {
-	public:
-		Strategy();
-
-	protected:
-
-		virtual std::string Describe() const;
-		virtual const EQ::versions::ClientVersion ClientVersion() const;
-
-		//magic macro to declare our opcode processors
-#include "ss_declare.h"
-#include "laurion_ops.h"
-	};
-
-}; /*Laurion*/
-
-#endif /*COMMON_LAURION_H*/

common/patches/laurion_limits.cpp

@@ -1,284 +0,0 @@
-/*	EQEMu:  Everquest Server Emulator
-	
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-	
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include "laurion_limits.h"
-
-#include "../strings.h"
-
-
-int16 Laurion::invtype::GetInvTypeSize(int16 inv_type)
-{
-	switch (inv_type) {
-	case invtype::typePossessions:
-		return invtype::POSSESSIONS_SIZE;
-	case invtype::typeBank:
-		return invtype::BANK_SIZE;
-	case invtype::typeSharedBank:
-		return invtype::SHARED_BANK_SIZE;
-	case invtype::typeTrade:
-		return invtype::TRADE_SIZE;
-	case invtype::typeWorld:
-		return invtype::WORLD_SIZE;
-	case invtype::typeLimbo:
-		return invtype::LIMBO_SIZE;
-	case invtype::typeTribute:
-		return invtype::TRIBUTE_SIZE;
-	case invtype::typeTrophyTribute:
-		return invtype::TROPHY_TRIBUTE_SIZE;
-	case invtype::typeGuildTribute:
-		return invtype::GUILD_TRIBUTE_SIZE;
-	case invtype::typeMerchant:
-		return invtype::MERCHANT_SIZE;
-	case invtype::typeDeleted:
-		return invtype::DELETED_SIZE;
-	case invtype::typeCorpse:
-		return invtype::CORPSE_SIZE;
-	case invtype::typeBazaar:
-		return invtype::BAZAAR_SIZE;
-	case invtype::typeInspect:
-		return invtype::INSPECT_SIZE;
-	case invtype::typeRealEstate:
-		return invtype::REAL_ESTATE_SIZE;
-	case invtype::typeViewMODPC:
-		return invtype::VIEW_MOD_PC_SIZE;
-	case invtype::typeViewMODBank:
-		return invtype::VIEW_MOD_BANK_SIZE;
-	case invtype::typeViewMODSharedBank:
-		return invtype::VIEW_MOD_SHARED_BANK_SIZE;
-	case invtype::typeViewMODLimbo:
-		return invtype::VIEW_MOD_LIMBO_SIZE;
-	case invtype::typeAltStorage:
-		return invtype::ALT_STORAGE_SIZE;
-	case invtype::typeArchived:
-		return invtype::ARCHIVED_SIZE;
-	case invtype::typeMail:
-		return invtype::MAIL_SIZE;
-	case invtype::typeGuildTrophyTribute:
-		return invtype::GUILD_TROPHY_TRIBUTE_SIZE;
-	case invtype::typeKrono:
-		return invtype::KRONO_SIZE;
-	case invtype::typeOther:
-		return invtype::OTHER_SIZE;
-	default:
-		return INULL;
-	}
-}
-
-const char* Laurion::invtype::GetInvTypeName(int16 inv_type)
-{
-	switch (inv_type) {
-	case invtype::TYPE_INVALID:
-		return "Invalid Type";
-	case invtype::typePossessions:
-		return "Possessions";
-	case invtype::typeBank:
-		return "Bank";
-	case invtype::typeSharedBank:
-		return "Shared Bank";
-	case invtype::typeTrade:
-		return "Trade";
-	case invtype::typeWorld:
-		return "World";
-	case invtype::typeLimbo:
-		return "Limbo";
-	case invtype::typeTribute:
-		return "Tribute";
-	case invtype::typeTrophyTribute:
-		return "Trophy Tribute";
-	case invtype::typeGuildTribute:
-		return "Guild Tribute";
-	case invtype::typeMerchant:
-		return "Merchant";
-	case invtype::typeDeleted:
-		return "Deleted";
-	case invtype::typeCorpse:
-		return "Corpse";
-	case invtype::typeBazaar:
-		return "Bazaar";
-	case invtype::typeInspect:
-		return "Inspect";
-	case invtype::typeRealEstate:
-		return "Real Estate";
-	case invtype::typeViewMODPC:
-		return "View MOD PC";
-	case invtype::typeViewMODBank:
-		return "View MOD Bank";
-	case invtype::typeViewMODSharedBank:
-		return "View MOD Shared Bank";
-	case invtype::typeViewMODLimbo:
-		return "View MOD Limbo";
-	case invtype::typeAltStorage:
-		return "Alt Storage";
-	case invtype::typeArchived:
-		return "Archived";
-	case invtype::typeMail:
-		return "Mail";
-	case invtype::typeGuildTrophyTribute:
-		return "Guild Trophy Tribute";
-	case invtype::typeKrono:
-		return "Krono";
-	case invtype::typeOther:
-		return "Other";
-	default:
-		return "Unknown Type";
-	}
-}
-
-bool Laurion::invtype::IsInvTypePersistent(int16 inv_type)
-{
-	switch (inv_type) {
-	case invtype::typePossessions:
-	case invtype::typeBank:
-	case invtype::typeSharedBank:
-	case invtype::typeTrade:
-	case invtype::typeWorld:
-	case invtype::typeLimbo:
-	case invtype::typeTribute:
-	case invtype::typeTrophyTribute:
-	case invtype::typeGuildTribute:
-		return true;
-	default:
-		return false;
-	}
-}
-
-const char* Laurion::invslot::GetInvPossessionsSlotName(int16 inv_slot)
-{
-	switch (inv_slot) {
-	case invslot::SLOT_INVALID:
-		return "Invalid Slot";
-	case invslot::slotCharm:
-		return "Charm";
-	case invslot::slotEar1:
-		return "Ear 1";
-	case invslot::slotHead:
-		return "Head";
-	case invslot::slotFace:
-		return "Face";
-	case invslot::slotEar2:
-		return "Ear 2";
-	case invslot::slotNeck:
-		return "Neck";
-	case invslot::slotShoulders:
-		return "Shoulders";
-	case invslot::slotArms:
-		return "Arms";
-	case invslot::slotBack:
-		return "Back";
-	case invslot::slotWrist1:
-		return "Wrist 1";
-	case invslot::slotWrist2:
-		return "Wrist 2";
-	case invslot::slotRange:
-		return "Range";
-	case invslot::slotHands:
-		return "Hands";
-	case invslot::slotPrimary:
-		return "Primary";
-	case invslot::slotSecondary:
-		return "Secondary";
-	case invslot::slotFinger1:
-		return "Finger 1";
-	case invslot::slotFinger2:
-		return "Finger 2";
-	case invslot::slotChest:
-		return "Chest";
-	case invslot::slotLegs:
-		return "Legs";
-	case invslot::slotFeet:
-		return "Feet";
-	case invslot::slotWaist:
-		return "Waist";
-	case invslot::slotPowerSource:
-		return "Power Source";
-	case invslot::slotAmmo:
-		return "Ammo";
-	case invslot::slotGeneral1:
-		return "General 1";
-	case invslot::slotGeneral2:
-		return "General 2";
-	case invslot::slotGeneral3:
-		return "General 3";
-	case invslot::slotGeneral4:
-		return "General 4";
-	case invslot::slotGeneral5:
-		return "General 5";
-	case invslot::slotGeneral6:
-		return "General 6";
-	case invslot::slotGeneral7:
-		return "General 7";
-	case invslot::slotGeneral8:
-		return "General 8";
-	case invslot::slotGeneral9:
-		return "General 9";
-	case invslot::slotGeneral10:
-		return "General 10";
-	case invslot::slotCursor:
-		return "Cursor";
-	default:
-		return "Unknown Slot";
-	}
-}
-
-const char* Laurion::invslot::GetInvSlotName(int16 inv_type, int16 inv_slot)
-{
-	if (inv_type == invtype::typePossessions)
-		return invslot::GetInvPossessionsSlotName(inv_slot);
-
-	int16 type_size = invtype::GetInvTypeSize(inv_type);
-
-	if (!type_size || inv_slot == invslot::SLOT_INVALID)
-		return "Invalid Slot";
-
-	if ((inv_slot + 1) >= type_size)
-		return "Unknown Slot";
-
-	static std::string ret_str;
-	ret_str = StringFormat("Slot %i", (inv_slot + 1));
-
-	return ret_str.c_str();
-}
-
-const char* Laurion::invbag::GetInvBagIndexName(int16 bag_index)
-{
-	if (bag_index == invbag::SLOT_INVALID)
-		return "Invalid Bag";
-
-	if (bag_index >= invbag::SLOT_COUNT)
-		return "Unknown Bag";
-
-	static std::string ret_str;
-	ret_str = StringFormat("Bag %i", (bag_index + 1));
-
-	return ret_str.c_str();
-}
-
-const char* Laurion::invaug::GetInvAugIndexName(int16 aug_index)
-{
-	if (aug_index == invaug::SOCKET_INVALID)
-		return "Invalid Augment";
-
-	if (aug_index >= invaug::SOCKET_COUNT)
-		return "Unknown Augment";
-
-	static std::string ret_str;
-	ret_str = StringFormat("Augment %i", (aug_index + 1));
-
-	return ret_str.c_str();
-}

common/patches/laurion_limits.h

@@ -1,355 +0,0 @@
-/*	EQEMu:  Everquest Server Emulator
-	
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-	
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef COMMON_LAURION_LIMITS_H
-#define COMMON_LAURION_LIMITS_H
-
-#include "../types.h"
-#include "../emu_versions.h"
-#include "../skills.h"
-
-namespace Laurion
-{
-	const int16 IINVALID = -1;
-	const int16 INULL = 0;
-
-	namespace inventory {
-		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const bool ConcatenateInvTypeLimbo = false;
-
-		const bool AllowOverLevelEquipment = true;
-
-		const bool AllowEmptyBagInBag = true;
-		const bool AllowClickCastFromBag = true;
-
-	} /*inventory*/
-
-	namespace invtype {
-		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		namespace enum_ {
-			enum InventoryTypes : int16 {
-				typePossessions = INULL,
-				typeBank,
-				typeSharedBank,
-				typeTrade,
-				typeWorld,
-				typeLimbo,
-				typeTribute,
-				typeTrophyTribute,
-				typeGuildTribute,
-				typeMerchant,
-				typeDeleted,
-				typeCorpse,
-				typeBazaar,
-				typeInspect,
-				typeRealEstate,
-				typeViewMODPC,
-				typeViewMODBank,
-				typeViewMODSharedBank,
-				typeViewMODLimbo,
-				typeAltStorage,
-				typeArchived,
-				typeMail,
-				typeGuildTrophyTribute,
-				typeKrono,
-				typeOther,
-				typeMercenaryItems,
-				typeViewModMercenaryItems,
-				typeMountKeyRingItems,
-				typeViewModMountKeyRingItems,
-				typeIllusionKeyRingItems,
-				typeViewModIllusionKeyRingItems,
-				typeFamiliarKeyRingItems,
-				typeViewModFamiliarKeyRingItems,
-				typeHeroForgeKeyRingItems,
-				typeViewModHeroForgeKeyRingItems,
-				typeTeleportationKeyRingItems,
-				typeViewModTeleportationKeyRingItems,
-				typeOverflow,
-				typeDragonHoard,
-				typeTradeskillDepot,
-				typeGuildTradeskillDepot
-			};
-
-		} // namespace enum_
-		using namespace enum_;
-
-		const int16 POSSESSIONS_SIZE = 34;
-		const int16 BANK_SIZE = 24;
-		const int16 SHARED_BANK_SIZE = 2;
-		const int16 TRADE_SIZE = 8;
-		const int16 WORLD_SIZE = 10;
-		const int16 LIMBO_SIZE = 36;
-		const int16 TRIBUTE_SIZE = 5;
-		const int16 TROPHY_TRIBUTE_SIZE = 0;//unknown
-		const int16 GUILD_TRIBUTE_SIZE = 2;//unverified
-		const int16 MERCHANT_SIZE = 200;
-		const int16 DELETED_SIZE = 0;//unknown - "Recovery Tab"
-		const int16 CORPSE_SIZE = POSSESSIONS_SIZE;
-		const int16 BAZAAR_SIZE = 200;
-		const int16 INSPECT_SIZE = 23;
-		const int16 REAL_ESTATE_SIZE = 0;//unknown
-		const int16 VIEW_MOD_PC_SIZE = POSSESSIONS_SIZE;
-		const int16 VIEW_MOD_BANK_SIZE = BANK_SIZE;
-		const int16 VIEW_MOD_SHARED_BANK_SIZE = SHARED_BANK_SIZE;
-		const int16 VIEW_MOD_LIMBO_SIZE = LIMBO_SIZE;
-		const int16 ALT_STORAGE_SIZE = 0;//unknown - "Shroud Bank"
-		const int16 ARCHIVED_SIZE = 0;//unknown
-		const int16 MAIL_SIZE = 0;//unknown
-		const int16 GUILD_TROPHY_TRIBUTE_SIZE = 0;//unknown
-		const int16 KRONO_SIZE = 0;//unknown
-		const int16 OTHER_SIZE = 0;//unknown
-
-		const int16 TRADE_NPC_SIZE = 4; // defined by implication
-
-		const int16 TYPE_INVALID = IINVALID;
-		const int16 TYPE_BEGIN = typePossessions;
-		const int16 TYPE_END = typeOther;
-		const int16 TYPE_COUNT = (TYPE_END - TYPE_BEGIN) + 1;
-
-		int16 GetInvTypeSize(int16 inv_type);
-		const char* GetInvTypeName(int16 inv_type);
-
-		bool IsInvTypePersistent(int16 inv_type);
-
-	} /*invtype*/
-
-	namespace invslot {
-		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		namespace enum_ {
-			enum InventorySlots : int16 {
-				slotCharm = INULL,
-				slotEar1,
-				slotHead,
-				slotFace,
-				slotEar2,
-				slotNeck,
-				slotShoulders,
-				slotArms,
-				slotBack,
-				slotWrist1,
-				slotWrist2,
-				slotRange,
-				slotHands,
-				slotPrimary,
-				slotSecondary,
-				slotFinger1,
-				slotFinger2,
-				slotChest,
-				slotLegs,
-				slotFeet,
-				slotWaist,
-				slotPowerSource,
-				slotAmmo,
-				slotGeneral1,
-				slotGeneral2,
-				slotGeneral3,
-				slotGeneral4,
-				slotGeneral5,
-				slotGeneral6,
-				slotGeneral7,
-				slotGeneral8,
-				slotGeneral9,
-				slotGeneral10,
-				slotGeneral11,
-				slotGeneral12,
-				slotCursor
-			};
-
-			constexpr int16 format_as(InventorySlots slot) { return static_cast<int16>(slot); }
-		} // namespace enum_
-		using namespace enum_;
-
-		const int16 SLOT_INVALID = IINVALID;
-		const int16 SLOT_BEGIN = INULL;
-
-		const int16 POSSESSIONS_BEGIN = slotCharm;
-		const int16 POSSESSIONS_END = slotCursor;
-		const int16 POSSESSIONS_COUNT = (POSSESSIONS_END - POSSESSIONS_BEGIN) + 1;
-
-		const int16 EQUIPMENT_BEGIN = slotCharm;
-		const int16 EQUIPMENT_END = slotAmmo;
-		const int16 EQUIPMENT_COUNT = (EQUIPMENT_END - EQUIPMENT_BEGIN) + 1;
-
-		//We support more if enabled but for now lets leave it at the 10 slots
-		const int16 GENERAL_BEGIN = slotGeneral1;
-		const int16 GENERAL_END = slotGeneral10;
-		const int16 GENERAL_COUNT = (GENERAL_END - GENERAL_BEGIN) + 1;
-
-		const int16 BONUS_BEGIN = invslot::slotCharm;
-		const int16 BONUS_STAT_END = invslot::slotPowerSource;
-		const int16 BONUS_SKILL_END = invslot::slotAmmo;
-
-		const int16 CORPSE_BEGIN = invslot::slotGeneral1;
-		const int16 CORPSE_END = invslot::slotGeneral1 + invslot::slotCursor;
-
-		const uint64 EQUIPMENT_BITMASK = 0x00000000007FFFFF;
-		const uint64 GENERAL_BITMASK = 0x00000007FF800000;
-		const uint64 CURSOR_BITMASK = 0x0000000800000000;
-		const uint64 POSSESSIONS_BITMASK = (EQUIPMENT_BITMASK | GENERAL_BITMASK | CURSOR_BITMASK); // based on 36-slot count (Laurion+)
-		const uint64 CORPSE_BITMASK = (GENERAL_BITMASK | CURSOR_BITMASK | (EQUIPMENT_BITMASK << 36)); // based on 36-slot count (Laurion+)
-
-
-		const char* GetInvPossessionsSlotName(int16 inv_slot);
-		const char* GetInvSlotName(int16 inv_type, int16 inv_slot);
-
-	} /*invslot*/
-
-	namespace invbag {
-		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const int16 SLOT_INVALID = IINVALID;
-		const int16 SLOT_BEGIN = INULL;
-		const int16 SLOT_END = 9; //254;
-		const int16 SLOT_COUNT = 10; //255; // server Size will be 255..unsure what actual client is (test)
-
-		const char* GetInvBagIndexName(int16 bag_index);
-
-	} /*invbag*/
-
-	namespace invaug {
-		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const int16 SOCKET_INVALID = IINVALID;
-		const int16 SOCKET_BEGIN = INULL;
-		const int16 SOCKET_END = 5;
-		const int16 SOCKET_COUNT = 6;
-
-		const char* GetInvAugIndexName(int16 aug_index);
-
-	} /*invaug*/
-
-	namespace item {
-		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		//enum Unknown : int { // looks like item class..but, RoF has it too - nothing in UF-
-		//	Unknown1 = 0,
-		//	Unknown2 = 1,
-		//	Unknown3 = 2,
-		//	Unknown4 = 5 // krono?
-		//};
-
-		enum ItemPacketType : int {
-			ItemPacketMerchant = 0x64,
-			ItemPacketTradeView = 0x65,
-			ItemPacketLoot = 0x66,
-			ItemPacketTrade = 0x67,
-			//looks like they added something at 0x68 that didn't exist before and shifted everything after it up by 1
-			ItemPacketUnknown068 = 0x68, //Not sure but it seems to deal with the cursor somehow.
-			ItemPacketCharInventory = 0x6A, //Rof 0x69 -> Larion 0x6a (requires translation)
-			ItemPacketLimbo = 0x6B, //0x6A -> 0x6B
-			ItemPacketWorldContainer = 0x6C,
-			ItemPacketTributeItem = 0x6D,
-			ItemPacketGuildTribute = 0x6E,
-			ItemPacketCharmUpdate = 0x6f,
-			ItemPacketRecovery = 0x72,
-			ItemPacketParcel = 0x74,
-			ItemPacketUnknown075 = 0x75, //Not sure but uses a lot of the same logic as the trade and char inventory types
-			ItemPacketOverflow = 0x76,
-			ItemPacketDragonHoard = 0x77,
-			ItemPacketTradeskill = 0x78,
-			ItemPacketTradeskillDepot = 0x79,
-			ItemPacketInvalid = 0xFF
-		};
-
-	} /*item*/
-
-	namespace profile {
-		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
-		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
-
-		const int16 POTION_BELT_SIZE = 5;
-
-		const int16 SKILL_ARRAY_SIZE = 100;
-
-	} /*profile*/
-
-	namespace constants {
-		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::LS;
-		const uint32 EXPANSION_BIT = EQ::expansions::bitLS;
-		const uint32 EXPANSIONS_MASK = EQ::expansions::maskLS;
-
-		const size_t CHARACTER_CREATION_LIMIT = 12;
-
-		const size_t SAY_LINK_BODY_SIZE = 56;
-		const uint32 MAX_GUILD_ID = 50000;
-
-	} /*constants*/
-
-	namespace behavior {
-		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const bool CoinHasWeight = false;
-
-	} /*behavior*/
-
-	namespace skills {
-		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		const size_t LastUsableSkill = EQ::skills::Skill2HPiercing;
-
-	} /*skills*/
-
-	namespace spells {
-		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Laurion; }
-
-		enum class CastingSlot : uint32 {
-			Gem1 = 0,
-			Gem2 = 1,
-			Gem3 = 2,
-			Gem4 = 3,
-			Gem5 = 4,
-			Gem6 = 5,
-			Gem7 = 6,
-			Gem8 = 7,
-			Gem9 = 8,
-			Gem10 = 9,
-			Gem11 = 10,
-			Gem12 = 11,
-			MaxGems = 18, // fallacy..only 12 slot are useable...
-			Item = 12,
-			Discipline = 13,
-			AltAbility = 0xFF
-		};
-
-		const int SPELL_ID_MAX = 71999;
-		const int SPELLBOOK_SIZE = 1120;
-		const int SPELL_GEM_COUNT = static_cast<uint32>(CastingSlot::MaxGems);
-		const int SPELL_GEM_RECAST_TIMER = 15;
-
-		const int LONG_BUFFS = 42;
-		const int SHORT_BUFFS = 30;
-		const int DISC_BUFFS = 1;
-		const int TOTAL_BUFFS = LONG_BUFFS + SHORT_BUFFS + DISC_BUFFS;
-		const int NPC_BUFFS = 400;
-		const int PET_BUFFS = NPC_BUFFS;
-		const int MERC_BUFFS = LONG_BUFFS;
-
-	} /*spells*/
-	
-}; /* Laurion */
-
-#endif /*COMMON_LAURION_LIMITS_H*/

common/patches/laurion_ops.h

@@ -1,96 +0,0 @@
-
-//list of packets we need to encode on the way out:
-E(OP_Action)
-E(OP_Animation)
-E(OP_ApplyPoison)
-E(OP_AugmentInfo)
-E(OP_BeginCast)
-E(OP_BlockedBuffs)
-E(OP_Buff)
-E(OP_BuffCreate)
-E(OP_CancelTrade)
-E(OP_CastSpell)
-E(OP_ChannelMessage)
-E(OP_CharInventory)
-E(OP_ClickObjectAction)
-E(OP_ClientUpdate)
-E(OP_Consider)
-E(OP_Damage)
-E(OP_Death)
-E(OP_DeleteCharge)
-E(OP_DeleteItem)
-E(OP_DeleteSpawn)
-E(OP_DisciplineUpdate)
-E(OP_ExpansionInfo)
-E(OP_ExpUpdate)
-E(OP_FormattedMessage)
-E(OP_GMTraining)
-E(OP_GMTrainSkillConfirm)
-E(OP_GroundSpawn)
-E(OP_HPUpdate)
-E(OP_Illusion)
-E(OP_ItemPacket)
-E(OP_LogServer)
-E(OP_ManaChange)
-E(OP_MobHealth)
-E(OP_MoneyOnCorpse)
-E(OP_MoveItem)
-E(OP_NewSpawn)
-E(OP_NewZone)
-E(OP_OnLevelMessage)
-E(OP_PlayerProfile)
-E(OP_RemoveBlockedBuffs)
-E(OP_RespondAA)
-E(OP_RequestClientZoneChange)
-E(OP_RecipeAutoCombine)
-E(OP_SendAATable)
-E(OP_SendCharInfo)
-E(OP_SendMaxCharacters)
-E(OP_SendMembership)
-E(OP_SendMembershipDetails)
-E(OP_SendZonepoints)
-E(OP_ShopPlayerBuy)
-E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
-E(OP_SkillUpdate)
-E(OP_SpecialMesg)
-E(OP_SpawnAppearance)
-E(OP_SpawnDoor)
-E(OP_Stun)
-E(OP_WearChange)
-E(OP_ZoneChange)
-E(OP_ZoneEntry)
-E(OP_ZonePlayerToBind)
-E(OP_ZoneSpawns)
-
-//list of packets we need to decode on the way in:
-D(OP_Animation)
-D(OP_ApplyPoison)
-D(OP_AugmentInfo)
-D(OP_AugmentItem)
-D(OP_BlockedBuffs)
-D(OP_CastSpell)
-D(OP_ChannelMessage)
-D(OP_ClientUpdate)
-D(OP_ClickDoor)
-D(OP_Consider)
-D(OP_ConsiderCorpse)
-D(OP_DeleteItem)
-D(OP_EnterWorld)
-D(OP_GMTraining)
-D(OP_GroupDisband)
-D(OP_GroupInvite)
-D(OP_GroupInvite2)
-D(OP_MoveItem)
-D(OP_RemoveBlockedBuffs)
-D(OP_SetServerFilter)
-D(OP_ShopPlayerBuy)
-D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
-D(OP_SpawnAppearance)
-D(OP_TradeSkillCombine)
-D(OP_WearChange)
-D(OP_ZoneEntry)
-D(OP_ZoneChange)
-#undef E
-#undef D

common/patches/patches.cpp

@@ -26,7 +26,7 @@
 #include "sod.h"
 #include "rof.h"
 #include "rof2.h"
-#include "laurion.h"
+
 
 void RegisterAllPatches(EQStreamIdentifier &into)
 {
@@ -36,7 +36,6 @@ void RegisterAllPatches(EQStreamIdentifier &into)
 	UF::Register(into);
 	RoF::Register(into);
 	RoF2::Register(into);
-	Laurion::Register(into);
 }
 
 void ReloadAllPatches()
@@ -47,5 +46,4 @@ void ReloadAllPatches()
 	UF::Reload();
 	RoF::Reload();
 	RoF2::Reload();
-	Laurion::Reload();
 }

common/patches/rof2.cpp

@@ -583,19 +583,21 @@ 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->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;
 				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>[{}]",
+					"(RoF2) AddTraderToBazaarWindow action <green>[{}] trader_id <green>[{}] entity_id <green>[{}] "
+					"zone_id <green>[{}] zone_instance_id <green>[{}]",
 					eq->action,
 					eq->trader_id,
 					eq->entity_id,
-					eq->zone_id
-				);
+					eq->zone_id,
+					eq->zone_instance_id);
 				dest->FastQueuePacket(&outapp);
 				break;
 			}
@@ -1843,11 +1845,11 @@ namespace RoF2
 			}
 		}
 
-		auto outapp     = new EQApplicationPacket(OP_GuildsList);
-		outapp->size    = packet_size;
-		outapp->pBuffer = buffer;
+		safe_delete_array(in->pBuffer);
 
-		dest->FastQueuePacket(&outapp);
+		in->pBuffer = buffer;
+		in->size    = packet_size;
+		dest->FastQueuePacket(&in);
 	}
 
 	ENCODE(OP_GuildTributeDonateItem)
@@ -2680,7 +2682,7 @@ namespace RoF2
 		{
 			float instrument_mod = 0.0f;
 			uint8 effect_type = emu->buffs[r].effect_type;
-			uint32 player_id = emu->buffs[r].player_id;
+			uint32 player_id = emu->buffs[r].player_id;;
 
 			if (emu->buffs[r].spellid != 0xFFFF && emu->buffs[r].spellid != 0)
 			{
@@ -3602,21 +3604,6 @@ namespace RoF2
 
 		FINISH_ENCODE();
 	}
-	
-	ENCODE(OP_ShopRequest)
-	{
-		ENCODE_LENGTH_EXACT(MerchantClick_Struct);
-		SETUP_DIRECT_ENCODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		OUT(npc_id);
-		OUT(player_id);
-		OUT(command);
-		OUT(rate);
-		OUT(tab_display);
-		eq->unknown02 = emu->unknown020;
-
-		FINISH_ENCODE();
-	}
 
 	ENCODE(OP_SkillUpdate)
 	{
@@ -6008,21 +5995,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_ShopRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::MerchantClick_Struct);
-		SETUP_DIRECT_DECODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		IN(npc_id);
-		IN(player_id);
-		IN(command);
-		IN(rate);
-		IN(tab_display);
-		emu->unknown020 = 0;
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Save)
 	{
 		DECODE_LENGTH_EXACT(structs::Save_Struct);
@@ -6248,6 +6220,11 @@ 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);
@@ -6388,9 +6365,18 @@ namespace RoF2
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
 		strn0cpy(hdr.unknown000, fmt::format("{:016}\0", inst->GetSerialNumber()).c_str(),sizeof(hdr.unknown000));
 
-		hdr.stacksize =
-			item->ID == PARCEL_MONEY_ITEM_ID ? inst->GetPrice() : (inst->IsStackable() ? ((inst->GetCharges() > 1000)
-				? 0xFFFFFFFF : inst->GetCharges()) : 1);
+		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.unknown004 = 0;
 
 		structs::InventorySlot_Struct slot_id{};

common/patches/rof2_ops.h

@@ -118,7 +118,6 @@ E(OP_SendZonepoints)
 E(OP_SetGuildRank)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
 E(OP_SkillUpdate)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnAppearance)
@@ -204,7 +203,6 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_ShopSendParcel)
 D(OP_Trader)
 D(OP_TraderBuy)

common/patches/rof2_structs.h

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

common/path_manager.cpp

@@ -5,31 +5,19 @@
 #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;
 	}
 
-	LogInfo("server [{}]", m_server_path);
+	std::filesystem::current_path(m_server_path);
 
 	if (!EQEmuConfig::LoadConfig()) {
 		LogError("Failed to load eqemu config");
@@ -38,66 +26,64 @@ void PathManager::LoadPaths()
 
 	const auto c = EQEmuConfig::get();
 
-	// 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();
-	}
-	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();
-	}
+	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();
+		}
 
-	// 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();
-	}
+		// absolute
+		if (File::Exists(fs::path{dir}.string())) {
+			return fs::absolute(fs::path{dir}).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();
-	}
+		// 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();
+			}
+		}
 
-	// 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();
-	}
+		// if all else fails, just set it to the config value
+		return dir;
+	};
 
-	// 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();
-	}
+	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"});
 
-	// 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();
-	}
+	// 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}
+	};
 
-	// patches
-	if (File::Exists(fs::path{ m_server_path + "/" + c->OpcodeDir }.string())) {
-		m_opcode_path = fs::relative(fs::path{ m_server_path + "/" + c->OpcodeDir }).string();
-	}
+	constexpr int name_width   = 15;
+	constexpr int path_width   = 0;
+	constexpr int break_length = 70;
 
-	// 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();
+	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);
+		}
 	}
-
-	// 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("opcode path [{}]", m_opcode_path);
-	LogInfo("plugins path [{}]", m_plugins_path);
-	LogInfo("quests path [{}]", m_quests_path);
-	LogInfo("shared_memory path [{}]", m_shared_memory_path);
+	LogInfo("{}", Strings::Repeat("-", break_length));
 }
 
 const std::string &PathManager::GetServerPath() const

common/repositories/adventure_stats_repository.h

@@ -49,23 +49,23 @@ public:
 		std::string field;
 
 		switch (theme_id) {
-			case LDoNThemes::GUK: {
+			case LDoNTheme::GUK: {
 				field = "guk_";
 				break;
 			}
-			case LDoNThemes::MIR: {
+			case LDoNTheme::MIR: {
 				field = "mir_";
 				break;
 			}
-			case LDoNThemes::MMC: {
+			case LDoNTheme::MMC: {
 				field = "mmc_";
 				break;
 			}
-			case LDoNThemes::RUJ: {
+			case LDoNTheme::RUJ: {
 				field = "ruj_";
 				break;
 			}
-			case LDoNThemes::TAK: {
+			case LDoNTheme::TAK: {
 				field = "tak_";
 				break;
 			}

common/repositories/base/base_trader_repository.h

@@ -28,13 +28,14 @@ public:
 		uint32_t aug_slot_4;
 		uint32_t aug_slot_5;
 		uint32_t aug_slot_6;
-		int32_t  item_sn;
+		uint32_t item_sn;
 		int32_t  item_charges;
-		uint64_t item_cost;
+		uint32_t item_cost;
 		uint8_t  slot_id;
 		uint32_t char_entity_id;
 		uint32_t char_zone_id;
-		int8_t   active_transaction;
+		int32_t  char_zone_instance_id;
+		uint8_t  active_transaction;
 	};
 
 	static std::string PrimaryKey()
@@ -60,6 +61,7 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
+			"char_zone_instance_id",
 			"active_transaction",
 		};
 	}
@@ -82,6 +84,7 @@ public:
 			"slot_id",
 			"char_entity_id",
 			"char_zone_id",
+			"char_zone_instance_id",
 			"active_transaction",
 		};
 	}
@@ -123,22 +126,23 @@ 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.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.char_zone_instance_id = 0;
+		e.active_transaction    = 0;
 
 		return e;
 	}
@@ -175,22 +179,23 @@ 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<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;
+			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;
 
 			return e;
 		}
@@ -238,7 +243,8 @@ 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.active_transaction));
+		v.push_back(columns[15] + " = " + std::to_string(e.char_zone_instance_id));
+		v.push_back(columns[16] + " = " + std::to_string(e.active_transaction));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -275,6 +281,7 @@ 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(
@@ -320,6 +327,7 @@ 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) + ")");
@@ -354,22 +362,23 @@ 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<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;
+			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;
 
 			all_entries.push_back(e);
 		}
@@ -394,22 +403,23 @@ 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<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;
+			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;
 
 			all_entries.push_back(e);
 		}
@@ -499,6 +509,7 @@ 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(
@@ -537,6 +548,7 @@ 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) + ")");

common/repositories/trader_repository.h

@@ -16,6 +16,7 @@ public:
 	struct DistinctTraders_Struct {
 		uint32      trader_id;
 		uint32      zone_id;
+		uint32      zone_instance_id;
 		uint32      entity_id;
 		std::string trader_name;
 	};
@@ -35,7 +36,8 @@ public:
 	GetBazaarSearchResults(
 		SharedDatabase &db,
 		BazaarSearchCriteria_Struct search,
-		uint32 char_zone_id
+		uint32 char_zone_id,
+		int32 char_zone_instance_id
 	);
 
 	static BulkTraders_Struct GetDistinctTraders(Database &db)
@@ -44,7 +46,7 @@ public:
 		std::vector<DistinctTraders_Struct> distinct_traders;
 
 		auto results = db.QueryDatabase(
-			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_entity_id, c.name "
+			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
 			"FROM trader AS t "
 			"JOIN character_data AS c ON t.char_id = c.id;"
 		);
@@ -54,10 +56,11 @@ public:
 		for (auto row: results) {
 			DistinctTraders_Struct e{};
 
-			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] : "";
+			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] : "";
 			all_entries.name_length += e.trader_name.length() + 1;
 
 			all_entries.traders.push_back(e);

common/ruletypes.h

@@ -340,7 +340,9 @@ RULE_STRING(World, Rules, "", "Server Rules, change from empty to have this be u
 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_INT(World, Id, 100, "Used by later clients to create GUIDs, expected to be Unique to the world but ultimately not that important")
+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)

common/servertalk.h

@@ -319,8 +319,6 @@
 // player events
 #define ServerOP_PlayerEvent 0x5100
 
-#define ServerOP_DataBucketCacheUpdate 0x5200
-
 enum {
 	CZUpdateType_Character,
 	CZUpdateType_Group,

common/version.h

@@ -25,7 +25,7 @@
 
 // Build variables
 // these get injected during the build pipeline
-#define CURRENT_VERSION "22.60.0-dev" // always append -dev to the current version for custom-builds
+#define CURRENT_VERSION "22.61.0-dev" // always append -dev to the current version for custom-builds
 #define LOGIN_VERSION "0.8.0"
 #define COMPILE_DATE    __DATE__
 #define COMPILE_TIME    __TIME__
@@ -42,7 +42,7 @@
  * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
  */
 
-#define CURRENT_BINARY_DATABASE_VERSION 9285
+#define CURRENT_BINARY_DATABASE_VERSION 9286
 #define CURRENT_BINARY_BOTS_DATABASE_VERSION 9045
 
 #endif

loginserver/client.cpp

@@ -573,13 +573,10 @@ void Client::SendExpansionPacketData(PlayerLoginReply_Struct& plrs)
 {
 	SerializeBuffer buf;
 	//from eqlsstr_us.txt id of each expansion, excluding 'Everquest'
-	int ExpansionLookup[30] = { 3007, 3008, 3009, 3010,	3012,
+	int ExpansionLookup[20] = { 3007, 3008, 3009, 3010,	3012,
 								3014, 3031, 3033, 3036, 3040,
 								3045, 3046, 3047, 3514, 3516,
-								3518, 3520, 3522, 3524, 3526,
-								3528, 3530, 3532, 3534, 3535,
-								3536, 3537, 3538, 3539, 3540
-	};
+								3518, 3520, 3522, 3524 };
 
 
 	if (server.options.IsDisplayExpansions()) {
@@ -587,26 +584,7 @@ void Client::SendExpansionPacketData(PlayerLoginReply_Struct& plrs)
 		int32_t expansion = server.options.GetMaxExpansions();
 		int32_t owned_expansion = (expansion << 1) | 1;
 
-		if (m_client_version == cv_laurion) {
-			buf.WriteInt32(0x00);
-			buf.WriteInt32(0x00);
-			buf.WriteInt16(0x00);
-			buf.WriteInt32(30);
-
-			for (int i = 0; i < 30; i++)
-			{
-				buf.WriteUInt32(i + 1);
-				buf.WriteUInt8(1);
-				buf.WriteInt32(ExpansionLookup[i]);
-				buf.WriteInt32(6046);
-				buf.WriteUInt32(0xFFFFFFFF);
-				buf.WriteUInt32(0);
-			}
-
-			auto out = std::make_unique<EQApplicationPacket>(OP_LoginExpansionPacketData, buf);
-			m_connection->QueuePacket(out.get());
-		}
-		else if (m_client_version == cv_sod) {
+		if (m_client_version == cv_sod) {
 
 			// header info of packet.  Requires OP_LoginExpansionPacketData=0x0031 to be in login_opcodes_sod.conf
 			buf.WriteInt32(0x00);

loginserver/client_manager.cpp

@@ -56,7 +56,7 @@ void CheckSoDOpcodeFile(const std::string& path) {
 	}
 }
 
-void CheckLaurionOpcodeFile(const std::string& path) {
+void CheckLarionOpcodeFile(const std::string& path) {
 	if (File::Exists(path)) {
 		return;
 	}
@@ -158,40 +158,40 @@ ClientManager::ClientManager()
 		}
 	);
 
-	int laurion_port = server.config.GetVariableInt("client_configuration", "laurion_port", 15900);
+	int larion_port = server.config.GetVariableInt("client_configuration", "larion_port", 15900);
 
-	EQStreamManagerInterfaceOptions laurion_opts(laurion_port, false, false);
+	EQStreamManagerInterfaceOptions larion_opts(larion_port, false, false);
 
-	laurion_stream = new EQ::Net::EQStreamManager(laurion_opts);
-	laurion_ops = new RegularOpcodeManager;
+	larion_stream = new EQ::Net::EQStreamManager(larion_opts);
+	larion_ops = new RegularOpcodeManager;
 
 	opcodes_path = fmt::format(
 		"{}/{}",
 		path.GetOpcodePath(),
-		"login_opcodes_laurion.conf"
+		"login_opcodes_larion.conf"
 	);
 
-	CheckLaurionOpcodeFile(opcodes_path);
+	CheckLarionOpcodeFile(opcodes_path);
 
-	if (!laurion_ops->LoadOpcodes(opcodes_path.c_str())) {
+	if (!larion_ops->LoadOpcodes(opcodes_path.c_str())) {
 		LogError(
-			"ClientManager fatal error: couldn't load opcodes for Laurion file [{0}]",
-			server.config.GetVariableString("client_configuration", "laurion_opcodes", "login_opcodes.conf")
+			"ClientManager fatal error: couldn't load opcodes for Larion file [{0}]",
+			server.config.GetVariableString("client_configuration", "larion_opcodes", "login_opcodes.conf")
 		);
 
 		run_server = false;
 	}
 
-	laurion_stream->OnNewConnection(
+	larion_stream->OnNewConnection(
 		[this](std::shared_ptr<EQ::Net::EQStream> stream) {
 			LogInfo(
-				"New Laurion client connection from [{0}:{1}]",
+				"New Larion client connection from [{0}:{1}]",
 				long2ip(stream->GetRemoteIP()),
 				stream->GetRemotePort()
 			);
 
-			stream->SetOpcodeManager(&laurion_ops);
-			Client* c = new Client(stream, cv_laurion);
+			stream->SetOpcodeManager(&larion_ops);
+			Client* c = new Client(stream, cv_larion);
 			clients.push_back(c);
 		}
 	);

loginserver/client_manager.h

@@ -55,8 +55,8 @@ private:
 	EQ::Net::EQStreamManager *titanium_stream;
 	OpcodeManager            *sod_ops;
 	EQ::Net::EQStreamManager *sod_stream;
-	OpcodeManager            *laurion_ops;
-	EQ::Net::EQStreamManager* laurion_stream;
+	OpcodeManager            *larion_ops;
+	EQ::Net::EQStreamManager* larion_stream;
 };
 
 #endif

loginserver/login_types.h

@@ -84,7 +84,7 @@ struct PlayEverquestResponse_Struct {
 enum LSClientVersion {
 	cv_titanium,
 	cv_sod,
-	cv_laurion
+	cv_larion
 };
 
 enum LSClientStatus {

loginserver/world_server.cpp

@@ -51,12 +51,6 @@ 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;
@@ -977,7 +971,8 @@ bool WorldServer::ValidateWorldServerAdminLogin(
 	return false;
 }
 
-void WorldServer::SerializeForClientServerListLegacy(class SerializeBuffer& out, bool use_local_ip) const {
+void WorldServer::SerializeForClientServerList(SerializeBuffer& out, bool use_local_ip, LSClientVersion version) const
+{
 	// see LoginClientServerData_Struct
 	if (use_local_ip) {
 		out.WriteString(GetLocalIP());
@@ -986,6 +981,10 @@ void WorldServer::SerializeForClientServerListLegacy(class SerializeBuffer& out,
 		out.WriteString(GetRemoteIP());
 	}
 
+	if (version == cv_larion) {
+		out.WriteUInt32(9000);
+	}
+
 	switch (GetServerListID()) {
 	case LS::ServerType::Legends:
 		out.WriteInt32(LS::ServerTypeFlags::Legends);
@@ -997,8 +996,15 @@ void WorldServer::SerializeForClientServerListLegacy(class SerializeBuffer& out,
 		out.WriteInt32(LS::ServerTypeFlags::Standard);
 		break;
 	}
-
-	out.WriteUInt32(GetServerId());
+	if (version == cv_larion) {
+		auto server_id = GetServerId();
+		//if this is 0, the client will not show the server in the list
+		out.WriteUInt32(1);
+		out.WriteUInt32(server_id);
+	}
+	else {
+		out.WriteUInt32(GetServerId());
+	}
 
 	out.WriteString(GetServerLongName());
 	out.WriteString("us"); // country code
@@ -1020,61 +1026,6 @@ void WorldServer::SerializeForClientServerListLegacy(class SerializeBuffer& out,
 	out.WriteUInt32(GetPlayersOnline());
 }
 
-void WorldServer::SerializeForClientServerListLaurion(class SerializeBuffer& out, bool use_local_ip) const {
-	if (use_local_ip) {
-		out.WriteString(GetLocalIP());
-	}
-	else {
-		out.WriteString(GetRemoteIP());
-	}
-
-	out.WriteUInt32(9000);
-	out.WriteUInt32(0);
-
-	uint32_t flags = 32; //all servers i saw had this set
-	switch (GetServerListID()) {
-	case LS::ServerType::Legends:
-		flags += LS::ServerTypeFlags::Legends;
-		break;
-	case LS::ServerType::Preferred:
-		flags += LS::ServerTypeFlags::Preferred;
-		break;
-	default:
-		flags += LS::ServerTypeFlags::Standard;
-		break;
-	}
-
-	out.WriteUInt32(flags);
-	out.WriteUInt32(GetServerId());
-	out.WriteString(GetServerLongName());
-	out.WriteString("EN");
-	out.WriteString("US");
-
-	if (GetStatus() < 0) {
-		if (GetZonesBooted() == 0) {
-			out.WriteInt32(LS::ServerStatusFlags::Down);
-		}
-		else {
-			out.WriteInt32(LS::ServerStatusFlags::Locked);
-		}
-	}
-	else {
-		out.WriteInt32(LS::ServerStatusFlags::Up);
-	}
-
-	out.WriteUInt32(GetPlayersOnline());
-}
-
-void WorldServer::SerializeForClientServerList(SerializeBuffer& out, bool use_local_ip, LSClientVersion version) const
-{
-	if (version == cv_laurion) {
-		SerializeForClientServerListLaurion(out, use_local_ip);
-	}
-	else {
-		SerializeForClientServerListLegacy(out, use_local_ip);
-	}
-}
-
 /**
  * @param in_server_list_id
  * @return
@@ -1350,12 +1301,6 @@ 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;

loginserver/world_server.h

@@ -149,10 +149,7 @@ public:
 
 	bool HandleNewLoginserverRegisteredOnly(Database::DbWorldRegistration &world_registration);
 	bool HandleNewLoginserverInfoUnregisteredAllowed(Database::DbWorldRegistration &world_registration);
-private:
-	void SerializeForClientServerListLegacy(class SerializeBuffer& out, bool use_local_ip) const;
-	void SerializeForClientServerListLaurion(class SerializeBuffer& out, bool use_local_ip) const;
-public:
+
 	void SerializeForClientServerList(class SerializeBuffer& out, bool use_local_ip, LSClientVersion version) const;
 
 private:
@@ -190,13 +187,6 @@ 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);
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eqemu-server",
-  "version": "22.60.0",
+  "version": "22.61.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/EQEmu/Server.git"

utils/patches/patch_Laurion.conf

@@ -1,699 +0,0 @@
-# ShowEQ Import Notes:
-# ZERO THE FILE first
-# perl -pi -e 's/0x[0-9a-fA-F]{4}/0x0000/g' opcodes.conf
-# Unknown Mapping:
-# OP_Action2 -> OP_Damage
-# OP_EnvDamage -> OP_Damage ---> might have been a one time mistake
-# Name Differences:
-# OP_CancelInvite -> OP_GroupCancelInvite
-# OP_GMFind -> OP_FindPersonRequest
-# OP_CommonMessage -> OP_ChannelMessage
-
-OP_Unknown=0x0000
-OP_ExploreUnknown=0x0000	# used for unknown explorer
-
-# world packets
-# Required to reach Char Select:
-OP_SendLoginInfo=0x2fca
-OP_ApproveWorld=0x0000
-OP_LogServer=0x6d4d
-OP_SendCharInfo=0x832
-OP_ExpansionInfo=0x066d
-OP_EnterWorld=0x6691
-OP_PostEnterWorld=0x2062
-OP_World_Client_CRC1=0x74c8
-OP_World_Client_CRC2=0x3984
-OP_World_Client_CRC3=0x6516
-OP_SendSpellChecksum=0x0000
-OP_SendSkillCapsChecksum=0x0000
-
-# Character Select Related:
-OP_SendMaxCharacters=0x13af
-OP_SendMembership=0x2aca
-OP_SendMembershipDetails=0x2608
-OP_CharacterCreateRequest=0x2df4
-OP_CharacterCreate=0x6a3c
-OP_DeleteCharacter=x67d7
-OP_RandomNameGenerator=0x49d9
-OP_ApproveName=0x11e5
-OP_MOTD=0x0be4
-OP_SetChatServer=0x0000
-OP_SetChatServer2=0x2726
-OP_ZoneServerInfo=0x2273
-OP_WorldComplete=0x195c
-OP_WorldUnknown001=0x2049
-OP_FloatListThing=0x66fd
-
-# Reasons for Disconnect:
-OP_ZoneUnavail=0x582d
-OP_WorldClientReady=0x7ed8
-OP_CharacterStillInZone=0x0000
-OP_WorldChecksumFailure=0x0000
-OP_WorldLoginFailed=0x0000
-OP_WorldLogout=0x0000
-OP_WorldLevelTooHigh=0x0000
-OP_CharInacessable=0x0000
-OP_UserCompInfo=0x0000
-OP_SendExeChecksum=0x0000
-OP_SendBaseDataChecksum=0x0000
-
-# Zone in opcodes
-OP_AckPacket=0x77c9
-OP_ZoneEntry=0x784a
-OP_ReqNewZone=0x3895
-OP_NewZone=0x4341
-OP_ZoneSpawns=0x17d9
-OP_PlayerProfile=0x1c76
-OP_TimeOfDay=0x3736
-OP_LevelUpdate=0x0eb2
-OP_Stamina=0x1563
-OP_RequestClientZoneChange=0x0191
-OP_ZoneChange=0x17a3
-OP_LockoutTimerInfo=0x0000
-OP_ZoneServerReady=0x0000
-OP_ZoneInUnknown=0x0000
-OP_LogoutReply=0x0000
-OP_PreLogoutReply=0x0000
-
-# Required to fully log in
-OP_SpawnAppearance=0x4eb0
-OP_ChangeSize=0x2fdc
-OP_Weather=0x6fe6
-OP_ReqClientSpawn=0x6732
-OP_SpawnDoor=0x4273
-OP_GroundSpawn=0x49c5
-OP_SendZonepoints=0x279f
-OP_BlockedBuffs=0x4fdb
-OP_RemoveBlockedBuffs=0x53cd
-OP_ClearBlockedBuffs=0x5752
-OP_WorldObjectsSent=0x2879
-OP_SendExpZonein=0x02b4
-OP_SendAATable=0x5f30
-OP_ClearAA=0x3498
-OP_ClearLeadershipAbilities=0x0000 #removed; leadership abilities are baked in and always on
-OP_RespondAA=0x4c67
-OP_UpdateAA=0x3b30
-OP_SendAAStats=0x7d65 #i'll be honest i think this was removed at some point but this is the op at the spot in the list
-OP_AAExpUpdate=0x642f #need to look into whether this has changed; exp did
-OP_ExpUpdate=0x611d
-OP_HPUpdate=0x775c
-OP_ManaChange=0x700f
-OP_TGB=0x0000 #removed; tgb is baked in and always on
-OP_SpecialMesg=0x7d93
-OP_CharInventory=0x21d6
-OP_WearChange=0x44c0
-OP_ClientUpdate=0x3a4b
-OP_ClientReady=0x0831
-OP_SetServerFilter=0x6b7f
-
-# Guild Opcodes
-OP_GuildsList=0x0000
-OP_GuildMemberList=0x0000
-OP_GuildMOTD=0x0000
-OP_GetGuildMOTD=0x0000
-OP_GetGuildMOTDReply=0x0000
-OP_GuildMemberUpdate=0x0000
-OP_GuildInvite=0x0000
-OP_GuildRemove=0x0000
-OP_GuildPeace=0x0000
-OP_SetGuildMOTD=0x0000
-OP_GuildWar=0x0000
-OP_GuildLeader=0x0000
-OP_GuildDelete=0x0000
-OP_GuildInviteAccept=0x0000
-OP_GuildDemote=0x0000
-OP_GuildPromote=0x0000
-OP_GuildPublicNote=0x0000
-OP_GuildManageBanker=0x0000
-OP_GuildBank=0x0000
-OP_GuildBankItemList=0x0000
-OP_SetGuildRank=0x0000
-OP_GuildUpdate=0x0000
-OP_GuildStatus=0x0000
-OP_GuildCreate=0x0000
-OP_GuildOpenGuildWindow=0x0000
-OP_GuildMemberLevel=0x0000
-OP_GuildMemberRankAltBanker=0x0000
-OP_GuildMemberPublicNote=0x0000
-OP_GuildMemberAdd=0x0000
-OP_GuildMemberRename=0x0000
-OP_GuildMemberDelete=0x0000
-OP_GuildMemberDetails=0x0000
-OP_GuildRenameGuild=0x0000
-OP_LFGuild=0x0000
-OP_GuildDeleteGuild=0x0000
-
-# GM/Guide Opcodes
-OP_GMServers=0x0000
-OP_GMBecomeNPC=0x0000
-OP_GMZoneRequest=0x0000
-OP_GMZoneRequest2=0x0000
-OP_GMGoto=0x0000
-OP_GMSearchCorpse=0x0000
-OP_GMHideMe=0x0000
-OP_GMDelCorpse=0x0000
-OP_GMApproval=0x0000
-OP_GMToggle=0x0000
-OP_GMSummon=0x0000
-OP_GMEmoteZone=0x0000
-OP_GMEmoteWorld=0x0000
-OP_GMFind=0x0000
-OP_GMKick=0x0000
-OP_GMKill=0x0000
-OP_GMNameChange=0x0000
-OP_GMLastName=0x0000
-
-# Misc Opcodes
-OP_QueryUCSServerStatus=0x2570
-OP_InspectRequest=0x0000
-OP_InspectAnswer=0x0000
-OP_InspectMessageUpdate=0x0000
-OP_BeginCast=0x31f9
-OP_ColoredText=0x0f3c
-OP_ConsentResponse=0x3229
-OP_MemorizeSpell=0x1d31
-OP_LinkedReuse=0x7a8e
-OP_SwapSpell=0x63c7
-OP_CastSpell=0x325b
-OP_Consider=0x53e3
-OP_FormattedMessage=0x7f7f
-OP_SimpleMessage=0x1943
-OP_Buff=0x6ce5
-OP_Illusion=0x5a3f
-OP_MoneyOnCorpse=0x39d3
-OP_RandomReply=0x6603
-OP_DenyResponse=0x3f2c
-OP_SkillUpdate=0x6735
-OP_GMTrainSkillConfirm=0x6fbc
-OP_RandomReq=0x528a
-OP_Death=0x429a
-OP_GMTraining=0x7c7a
-OP_GMEndTraining=0x3ec6
-OP_GMTrainSkill=0x54e1
-OP_Animation=0x79c7
-OP_Begging=0x7ded
-OP_Consent=0x44fc
-OP_ConsentDeny=0x3df9
-OP_AutoFire=0x5280
-OP_PetCommands=0x0000
-OP_PetCommandState=0x0000
-OP_PetHoTT=0x0000
-OP_DeleteSpell=0x4281
-OP_Surname=0x0000
-OP_ClearSurname=0x0000
-OP_FaceChange=0x0000
-OP_SetFace=0x0000
-OP_SenseHeading=0x6fcf
-OP_Action=0x4c13
-OP_ConsiderCorpse=0x6092
-OP_HideCorpse=0x3f5c
-OP_CorpseDrag=0x234d
-OP_CorpseDrop=0x4342 
-OP_Bug=0x770b
-OP_Feedback=0x0000
-OP_Report=0x5bcf
-OP_Damage=0x7d07
-OP_ChannelMessage=0x6adc
-OP_Assist=0x51f1
-OP_AssistGroup=0x3f23
-OP_MoveCoin=0x4e6a
-OP_ZonePlayerToBind=0x5643
-OP_KeyRing=0x0000
-OP_WhoAllRequest=0x2a09
-OP_WhoAllResponse=0x6404
-OP_FriendsWho=0x75a2
-OP_ConfirmDelete=0x4dd0
-OP_Logout=0x771d
-OP_Rewind=0x2b19
-OP_TargetCommand=0x3b18
-OP_Hide=0x1cdf
-OP_Jump=0x6fa0
-OP_Camp=0x326f
-OP_Emote=0x0000
-OP_SetRunMode=0x1449
-OP_BankerChange=0x2a33
-OP_TargetMouse=0x5741
-OP_MobHealth=0x5b77
-OP_InitialMobHealth=0x0000	# Unused?
-OP_TargetHoTT=0x0000
-OP_TargetBuffs=0x0000
-OP_XTargetResponse=0x0000
-OP_XTargetRequest=0x0000
-OP_XTargetAutoAddHaters=0x0000
-OP_XTargetOpen=0x0000
-OP_XTargetOpenResponse=0x0000
-OP_BuffCreate=0x27a1
-OP_BuffRemoveRequest=0x4507
-OP_DeleteSpawn=0x7712
-OP_AutoAttack=0x3f03
-OP_AutoAttack2=0x1c31
-OP_Consume=0x5ef7
-OP_MoveItem=0x11e3
-OP_MoveMultipleItems=0x5205
-OP_DeleteItem=0x0150
-OP_DeleteCharge=0x1b7e
-OP_ItemPacket=0x7d43
-OP_ItemLinkResponse=0x0000
-OP_ItemLinkClick=0x0000
-OP_ItemPreview=0x0000
-OP_NewSpawn=0x3ea8
-OP_Track=0x5351
-OP_TrackTarget=0x611a
-OP_TrackUnknown=0x2c7a
-OP_ClickDoor=0x733c
-OP_MoveDoor=0x567c
-OP_RemoveAllDoors=0x73e8
-OP_EnvDamage=0x1ffd
-OP_BoardBoat=0x7015
-OP_LeaveBoat=0x2486
-OP_ControlBoat=0x166f
-OP_Forage=0x4c52
-OP_SafeFallSuccess=0x6690
-OP_RezzComplete=0x0000
-OP_RezzRequest=0x0000
-OP_RezzAnswer=0x0000
-OP_Shielding=0x0000
-OP_RequestDuel=0x0000
-OP_MobRename=0x0000
-OP_AugmentItem=0x3a1b
-OP_WeaponEquip1=0x0000
-OP_PlayerStateAdd=0x2178
-OP_PlayerStateRemove=0x178e
-OP_ApplyPoison=0x55b9
-OP_Save=0x6da2
-OP_TestBuff=0x0000
-OP_CustomTitles=0x0000
-OP_Split=0x7f6e
-OP_YellForHelp=0x5fc9
-OP_LoadSpellSet=0x0000
-OP_Bandolier=0x0000
-OP_PotionBelt=0x0000
-OP_DuelDecline=0x0000
-OP_DuelAccept=0x0000
-OP_SaveOnZoneReq=0x3bfe
-OP_ReadBook=0x51af
-OP_Dye=0x0000
-OP_InterruptCast=0x1d71
-OP_AAAction=0x71BB
-OP_LeadershipExpToggle=0x0000 #removed, these act as if all purchased now
-OP_LeadershipExpUpdate=0x0000 #removed, these act as if all purchased now
-OP_PurchaseLeadershipAA=0x0000 #removed, these act as if all purchased now
-OP_UpdateLeadershipAA=0x0000 #removed, these act as if all purchased now
-OP_MarkNPC=0x0000
-OP_ClearNPCMarks=0x0000
-OP_DelegateAbility=0x0000
-OP_SetGroupTarget=0x0000
-OP_Charm=0x66bb
-OP_Stun=0x34be
-OP_SendFindableNPCs=0x0000
-OP_FindPersonRequest=0x0000
-OP_FindPersonReply=0x0000
-OP_Sound=0x2fa8
-OP_CashReward=0x5e23
-OP_PetBuffWindow=0x0000
-OP_LevelAppearance=0x5d24
-OP_Translocate=0x2772
-OP_Sacrifice=0x2cbf
-OP_PopupResponse=0x6be9
-OP_OnLevelMessage=0x2a41
-OP_AugmentInfo=0x2e11
-OP_Petition=0x0000
-OP_SomeItemPacketMaybe=0x0000
-OP_PVPStats=0x0000
-OP_PVPLeaderBoardRequest=0x0000
-OP_PVPLeaderBoardReply=0x0000
-OP_PVPLeaderBoardDetailsRequest=0x0000
-OP_PVPLeaderBoardDetailsReply=0x0000
-OP_RestState=0x0a92
-OP_RespawnWindow=0x55ed
-OP_LDoNButton=0x0000
-OP_SetStartCity=0x0000
-OP_VoiceMacroIn=0x703f
-OP_VoiceMacroOut=0x72d1
-OP_ItemViewUnknown=0x0000
-OP_VetRewardsAvaliable=0x0000
-OP_VetClaimRequest=0x0000
-OP_VetClaimReply=0x0000
-OP_DisciplineUpdate=0x6ce4
-OP_DisciplineTimer=0x7436
-OP_BecomeCorpse=0x0000			# Unused?
-OP_Action2=0x0000				# Unused?
-OP_MobUpdate=0x0000
-OP_NPCMoveUpdate=0x0000
-OP_CameraEffect=0x2f01
-OP_SpellEffect=0x7378
-OP_AddNimbusEffect=0x069f
-OP_RemoveNimbusEffect=0x19ee
-OP_AltCurrency=0x0000
-OP_AltCurrencyMerchantRequest=0x0000
-OP_AltCurrencyMerchantReply=0x0000
-OP_AltCurrencyPurchase=0x0000
-OP_AltCurrencySell=0x0000
-OP_AltCurrencySellSelection=0x0000
-OP_AltCurrencyReclaim=0x0000
-OP_CrystalCountUpdate=0x0000
-OP_CrystalCreate=0x0000
-OP_CrystalReclaim=0x0000
-OP_Untargetable=0x026f
-OP_IncreaseStats=0x1005
-OP_Weblink=0x16a3
-OP_OpenContainer=0x6758
-OP_Marquee=0x6bca
-OP_ItemRecastDelay=0x547a
-#OP_OpenInventory=0x0000			# Likely does not exist in RoF -U
-OP_ResetAA=0x53c0
-OP_Fling=0x3731
-OP_CancelSneakHide=0x7452
-OP_AggroMeterLockTarget=0x0000
-OP_AggroMeterTargetInfo=0x0000
-OP_AggroMeterUpdate=0x0000
-OP_UnderWorld=0x4ca9			# clients sends up when they detect an underworld issue, might be useful for cheat detection
-OP_KickPlayers=0x7154
-OP_BookButton=0x014d
-
-# Expeditions
-OP_DzQuit=0x0000
-OP_DzListTimers=0x0000
-OP_DzAddPlayer=0x0000
-OP_DzRemovePlayer=0x0000
-OP_DzSwapPlayer=0x0000
-OP_DzMakeLeader=0x0000
-OP_DzPlayerList=0x0000
-OP_DzExpeditionInvite=0x0000
-OP_DzExpeditionInviteResponse=0x0000
-OP_DzExpeditionInfo=0x0000
-OP_DzExpeditionLockoutTimers=0x0000
-OP_DzMemberList=0x0000
-OP_DzMemberListName=0x0000
-OP_DzMemberListStatus=0x0000
-OP_DzSetLeaderName=0x0000
-OP_DzExpeditionEndsWarning=0x0000
-OP_DzCompass=0x0000
-OP_DzChooseZone=0x0000
-OP_DzChooseZoneReply=0x0000
-
-# New Opcodes
-OP_SpawnPositionUpdate=0x0000	# Actually OP_MobUpdate ?
-OP_ManaUpdate=0x0000
-OP_EnduranceUpdate=0x0000
-OP_MobManaUpdate=0x0000
-OP_MobEnduranceUpdate=0x0000
-
-# Mercenary Opcodes
-OP_MercenaryDataUpdateRequest=0x0000
-OP_MercenaryDataUpdate=0x0000
-OP_MercenaryDataRequest=0x0000
-OP_MercenaryDataResponse=0x0000
-OP_MercenaryHire=0x0000
-OP_MercenaryDismiss=0x0000
-OP_MercenaryTimerRequest=0x0000
-OP_MercenaryTimer=0x0000
-OP_MercenaryUnknown1=0x0000
-OP_MercenaryCommand=0x0000
-OP_MercenarySuspendRequest=0x0000
-OP_MercenarySuspendResponse=0x0000
-OP_MercenaryUnsuspendResponse=0x0000
-
-# Looting
-OP_LootRequest=0x60e5
-OP_EndLootRequest=0x35f6
-OP_LootItem=0x0856
-OP_LootComplete=0x1f5e
-
-# bazaar trader stuff:
-OP_BazaarSearch=0x0000
-OP_TraderDelItem=0x0000
-OP_BecomeTrader=0x0000
-OP_TraderShop=0x0000
-OP_TraderBulkSend=0x0000
-OP_Trader=0x0000
-OP_Barter=0x0000
-OP_BuyerItems=0x0000
-OP_TraderBuy=0x0000
-OP_ShopItem=0x0000
-OP_BazaarInspect=0x0000
-OP_Bazaar=0x0000
-OP_TraderItemUpdate=0x0000
-
-# pc/npc trading
-OP_TradeRequest=0x7066
-OP_TradeAcceptClick=0x34ad
-OP_TradeRequestAck=0x1c6b
-OP_TradeCoins=0x44fe
-OP_FinishTrade=0x0ec6
-OP_CancelTrade=0x5839
-OP_TradeMoneyUpdate=0x5fb3
-OP_MoneyUpdate=0x70bb
-OP_TradeBusy=0x109f
-
-# Sent after canceling trade or after closing tradeskill object
-OP_FinishWindow=0x50d4
-OP_FinishWindow2=0x6b03
-
-# Sent on Live for what seems to be item existance verification
-# Ex. Before Right Click Effect happens from items
-OP_ItemVerifyRequest=0x2003
-OP_ItemVerifyReply=0x43d0
-
-OP_ItemAdvancedLoreText=0x0000
-
-# merchant stuff
-OP_ShopPlayerSell=0x6489
-OP_ShopRequest=0x840
-OP_ShopEnd=0x74bb
-OP_ShopEndConfirm=0x2ed1
-OP_ShopPlayerBuy=0x625e
-OP_ShopDelItem=0x4ce4
-OP_ShopSendParcel=0x0f16
-OP_ShopDeleteParcel=0x4e2a
-OP_ShopRetrieveParcel=0x27d1
-OP_ShopParcelIcon=0x4f27
-
-# tradeskill stuff:
-OP_ClickObject=0x687e
-OP_ClickObjectAction=0x110f
-OP_ClearObject=0x6155
-OP_RecipeDetails=0x01e7
-OP_RecipesFavorite=0x0495
-OP_RecipesSearch=0x2f4e
-OP_RecipeReply=0x2cd2
-OP_RecipeAutoCombine=0x5dba
-OP_TradeSkillCombine=0x4ed8
-
-# Tribute Packets:
-OP_TributeUpdate=0x0000
-OP_TributeTimer=0x0000
-OP_SendTributes=0x0000
-OP_RequestGuildTributes=0x0000
-OP_TributeInfo=0x0000
-OP_OpenTributeMaster=0x0000
-OP_SelectTribute=0x0000
-OP_TributeItem=0x0000
-OP_TributeMoney=0x0000
-OP_TributeToggle=0x0000
-OP_TributePointUpdate=0x0000
-OP_TributeNPC=0x0000
-OP_GuildTributeInfo=0x0000
-OP_OpenTributeReply=0x0000
-OP_GuildTributeStatus=0x0000
-OP_GuildSaveActiveTributes=0x0000
-OP_GuildSendActiveTributes=0x0000
-OP_GuildTributeToggleReq=0x0000
-OP_GuildTributeToggleReply=0x0000
-OP_GuildTributeFavorAndTimer=0x0000
-OP_GuildTributeDonateItem=0x0000
-OP_GuildTributeDonatePlat=0x0000
-OP_GuildSelectTribute=0x0000
-OP_GuildModifyBenefits=0x0000
-OP_GuildOptInOut=0x0000
-OP_SendGuildTributes=0x0000
-OP_OpenGuildTributeMaster=0x0000
-
-# Adventure packets:
-OP_LeaveAdventure=0x0000
-OP_AdventureFinish=0x0000
-OP_AdventureInfoRequest=0x0000
-OP_AdventureInfo=0x0000
-OP_AdventureRequest=0x0000
-OP_AdventureDetails=0x0000
-OP_AdventureData=0x0000
-OP_AdventureUpdate=0x0000
-OP_AdventureMerchantRequest=0x0000
-OP_AdventureMerchantResponse=0x0000
-OP_AdventureMerchantPurchase=0x0000
-OP_AdventureMerchantSell=0x0000
-OP_AdventurePointsUpdate=0x0000
-OP_AdventureStatsRequest=0x0000
-OP_AdventureStatsReply=0x0000
-OP_AdventureLeaderboardRequest=0x0000
-OP_AdventureLeaderboardReply=0x0000
-
-# Group Opcodes
-OP_GroupDisband=0x78ef
-OP_GroupInvite=0x1d90
-OP_GroupFollow=0x0000
-OP_GroupUpdate=0x0000
-OP_GroupUpdateB=0x0000
-OP_GroupCancelInvite=0x0000
-OP_GroupAcknowledge=0x0000
-OP_GroupDelete=0x0000
-OP_CancelInvite=0x0000
-OP_GroupFollow2=0x0000
-OP_GroupInvite2=0x1e7e
-OP_GroupDisbandYou=0x0000
-OP_GroupDisbandOther=0x0000
-OP_GroupLeaderChange=0x0000
-OP_GroupRoles=0x0000
-OP_GroupMakeLeader=0x0000
-OP_DoGroupLeadershipAbility=0x0000
-OP_GroupLeadershipAAUpdate=0x0000 # removed these act as if you have always purchased them
-OP_GroupMentor=0x0000
-OP_InspectBuffs=0x0000
-
-# LFG/LFP Opcodes
-OP_LFGCommand=0x0000
-OP_LFGGetMatchesRequest=0x0000
-OP_LFGGetMatchesResponse=0x0000
-OP_LFPGetMatchesRequest=0x0000
-OP_LFPGetMatchesResponse=0x0000
-OP_LFPCommand=0x0000
-OP_LFGAppearance=0x0000
-OP_LFGResponse=0x0000
-
-# Raid Opcodes
-OP_RaidInvite=0x0000
-OP_RaidUpdate=0x0000
-OP_RaidJoin=0x0000
-OP_RaidDelegateAbility=0x0000
-OP_MarkRaidNPC=0x0000
-OP_RaidClearNPCMarks=0x0000							 
-
-# Button-push commands
-OP_Taunt=0x5064
-OP_CombatAbility=0xbf
-OP_SenseTraps=0x579c
-OP_PickPocket=0x53d1
-OP_DisarmTraps=0x21bf
-OP_Disarm=0x31e9
-OP_Sneak=0x78a7
-OP_Fishing=0x57cc
-OP_InstillDoubt=0x57cc
-OP_FeignDeath=0x14b8
-OP_Mend=0x6b8
-OP_Bind_Wound=0x650e
-OP_LDoNOpen=0x448
-OP_LDoNPickLock=0x61c8
-OP_LDoNInspect=0xc1c
-
-# Task packets
-OP_TaskDescription=0x0000
-OP_TaskActivity=0x0000
-OP_CompletedTasks=0x0000
-OP_TaskActivityComplete=0x0000
-OP_AcceptNewTask=0x0000
-OP_CancelTask=0x0000
-OP_AvaliableTask=0x0000
-OP_TaskHistoryRequest=0x0000
-OP_TaskHistoryReply=0x0000
-OP_DeclineAllTasks=0x0000
-OP_TaskRequestTimer=0x0000
-OP_TaskSelectWindow=0x0000
-
-# Shared Tasks
-OP_SharedTaskMemberList=0x0000      #
-OP_SharedTaskRemovePlayer=0x0000    # /taskremoveplayer
-OP_SharedTaskAddPlayer=0x0000       # /taskaddplayer
-OP_SharedTaskMakeLeader=0x0000      # /taskmakeleader
-OP_SharedTaskInvite=0x0000          # Dialog window
-OP_SharedTaskInviteResponse=0x0000  # Dialog window response
-OP_SharedTaskAcceptNew=0x0000       #
-OP_SharedTaskMemberChange=0x0000    #
-OP_TaskTimers=0x0000                # /tasktimers
-OP_SharedTaskQuit=0x0000            # /taskquit
-OP_SharedTaskSelectWindow=0x0000
-OP_SharedTaskPlayerList=0x0000      # /taskplayerlist
-
-# Title opcodes
-OP_NewTitlesAvailable=0x0000
-OP_RequestTitles=0x0000
-OP_SendTitleList=0x0000
-OP_SetTitle=0x0000
-OP_SetTitleReply=0x0000
-
-# mail opcodes
-OP_Command=0x0000
-OP_MailboxHeader=0x0000
-OP_MailHeader=0x0000
-OP_MailBody=0x0000
-OP_NewMail=0x0000
-OP_SentConfirm=0x0000
-
-########### Below this point should not be needed ###########
-
-# This section are all unknown in Titanium
-OP_ForceFindPerson=0x0000
-OP_LocInfo=0x0000
-OP_ReloadUI=0x0000
-OP_ItemName=0x0000
-OP_ItemLinkText=0x0000
-OP_MultiLineMsg=0x0000
-OP_MendHPUpdate=0x0000
-OP_TargetReject=0x0000
-OP_SafePoint=0x0000
-OP_ApproveZone=0x0000
-OP_ZoneComplete=0x0000
-OP_ClientError=0x0000
-OP_DumpName=0x0000
-OP_Heartbeat=0x0000
-OP_CrashDump=0x0000
-OP_LoginComplete=0x0000
-
-# discovered opcodes not yet used:
-OP_PickLockSuccess=0x0000
-OP_PlayMP3=0x6451
-OP_ReclaimCrystals=0x0000
-OP_DynamicWall=0x0000
-OP_OpenDiscordMerchant=0x0000
-OP_DiscordMerchantInventory=0x0000
-OP_GiveMoney=0x0000
-OP_RequestKnowledgeBase=0x0000
-OP_KnowledgeBase=0x0000
-OP_SlashAdventure=0x0000 # /adventure
-OP_BecomePVPPrompt=0x0000
-OP_MoveLogRequest=0x0000 # gone I think
-OP_MoveLogDisregard=0x0000 # gone I think
-
-# named unknowns, to make looking for real unknown easier
-OP_AnnoyingZoneUnknown=0x0000
-OP_Some6ByteHPUpdate=0x0000 #seems to happen when you target group members
-OP_QueryResponseThing=0x0000
-
-
-# realityincarnate: these are just here to stop annoying several thousand byte packet dumps
-#OP_LoginUnknown1=0x0000 # OP_SendSpellChecksum
-#OP_LoginUnknown2=0x0000 # OP_SendSkillCapsChecksum
-
-# Petition Opcodes
-OP_PetitionSearch=0x0000 #search term for petition
-OP_PetitionSearchResults=0x0000 #(list of?) matches from search
-OP_PetitionSearchText=0x0000 #text results of search
-
-OP_PetitionUpdate=0x0000
-OP_PetitionCheckout=0x0000
-OP_PetitionCheckIn=0x0000
-OP_PetitionQue=0x0000
-OP_PetitionUnCheckout=0x0000
-OP_PetitionDelete=0x0000
-OP_DeletePetition=0x0000
-OP_PetitionResolve=0x0000
-OP_PDeletePetition=0x0000
-OP_PetitionBug=0x0000
-OP_PetitionRefresh=0x0000
-OP_PetitionCheckout2=0x0000
-OP_PetitionViewPetition=0x0000
-
-#aura related
-OP_UpdateAura=0x0000
-OP_RemoveTrap=0x0000
-
-OP_Fingerprint=0x7a5b

utils/scripts/build/should-release/go.mod

@@ -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.21.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )

utils/scripts/build/should-release/go.sum

@@ -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.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+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/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=

utils/stream_parser/.gitignore

@@ -1,388 +0,0 @@
-## 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

utils/stream_parser/common/Daybreak/Connection.cs

@@ -1,621 +0,0 @@
-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)
-                        {
-                            //if(data.Length != 21)
-                            //{
-                            //    return;
-                            //}
-
-                            _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)
-        {
-            try
-            {
-                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;
-            } catch(Exception ex)
-            {
-                return false;
-            }
-        }
-
-        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; }
-        }
-    }
-}

utils/stream_parser/common/Daybreak/GamePacket.cs

@@ -1,114 +0,0 @@
-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();
-        }
-    }
-}

utils/stream_parser/common/Daybreak/IConnection.cs

@@ -1,40 +0,0 @@
-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; }
-    }
-}

utils/stream_parser/common/Daybreak/IParser.cs

@@ -1,16 +0,0 @@
-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);
-    }
-}

utils/stream_parser/common/Daybreak/Opcode.cs

@@ -1,39 +0,0 @@
-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;
-    }
-}

utils/stream_parser/common/Daybreak/Parser.cs

@@ -1,115 +0,0 @@
-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 || raw.LinkLayerType == PacketDotNet.LinkLayers.Null)
-            {
-                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)
-            {
-                if(data.Length != 24)
-                {
-                    _logger.LogTrace("Tossing packet, {0} was not the right size for a SessionRequest", data.Length);
-                    return;
-                }
-
-                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;
-        }
-    }
-}

utils/stream_parser/common/Util/Crc32.cs

@@ -1,103 +0,0 @@
-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;
-        }
-    }
-}

utils/stream_parser/common/common.csproj

@@ -1,14 +0,0 @@
-<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>

utils/stream_parser/stream_parser.sln

@@ -1,51 +0,0 @@
-
-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

utils/stream_parser/stream_parser/ConsoleHostedService.cs

@@ -1,337 +0,0 @@
-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();
-
-                try
-                {
-                    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 (c.Value.ConnectionType == ConnectionType.Unknown && !o.DumpUnknownStreams)
-                               {
-                                   continue;
-                               }
-
-                               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)
-                           {
-                               stops_processing = stops_processing || err.StopsProcessing || err is MissingRequiredOptionError;
-                           }
-
-                           if (stops_processing)
-                           {
-                               _applicationLifetime.StopApplication();
-                           }
-                       });
-                } 
-                catch(Exception ex)
-                {
-                    _logger.LogError(ex, "Error parsing command line arguments");
-                    _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;
-            }
-        }
-    }
-}

utils/stream_parser/stream_parser/ConsoleHostedServiceOptions.cs

@@ -1,29 +0,0 @@
-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; }
-
-        [Option("enable-unknown-streams", Default = false, HelpText = "Enable dumping of unknown streams; they will be skipped otherwise.")]
-        public bool DumpUnknownStreams { get; set; }
-    }
-}

utils/stream_parser/stream_parser/Program.cs

@@ -1,25 +0,0 @@
-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>();
-                });
-        }
-    }
-}

utils/stream_parser/stream_parser/Properties/launchSettings.json

@@ -1,9 +0,0 @@
-{
-  "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\\"
-    }
-  }
-}

utils/stream_parser/stream_parser/stream_parser.csproj

@@ -1,24 +0,0 @@
-<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>

world/cli/copy_character.cpp

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

world/client.cpp

@@ -541,6 +541,17 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app)
 					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();
@@ -1209,11 +1220,8 @@ bool Client::Process() {
 	}
 
 	if(connect.Check()){
-		if (!(m_ClientVersionBit & EQ::versions::maskLaurionAndLater)) {
-			SendGuildList();// Send OPCode: OP_GuildsList
-			SendApproveWorld();
-		}
-		
+		SendGuildList();// Send OPCode: OP_GuildsList
+		SendApproveWorld();
 		connect.Disable();
 	}
 

world/login_server.cpp

@@ -595,11 +595,6 @@ bool LoginServer::Connect()
 		);
 	}
 
-	m_keepalive = std::make_unique<EQ::Timer>(
-		1000,
-		true,
-		std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1));
-
 	return true;
 }
 
@@ -716,8 +711,3 @@ void LoginServer::SendAccountUpdate(ServerPacket *pack)
 	}
 }
 
-void LoginServer::OnKeepAlive(EQ::Timer *t)
-{
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	SendPacket(&pack);
-}

world/login_server.h

@@ -50,7 +50,6 @@ 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;

world/queryserv.cpp

@@ -22,7 +22,6 @@ 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)
@@ -54,8 +53,3 @@ bool QueryServConnection::SendPacket(ServerPacket* pack)
 	return true;
 }
 
-void QueryServConnection::OnKeepAlive(EQ::Timer *t)
-{
-	ServerPacket pack(ServerOP_KeepAlive, 0);
-	SendPacket(&pack);
-}

world/queryserv.h

@@ -15,7 +15,6 @@ 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;

world/ucs.cpp

@@ -31,8 +31,6 @@ 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
@@ -92,13 +90,3 @@ 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);
-}

world/ucs.h

@@ -23,11 +23,6 @@ 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_*/

world/zonelist.cpp

@@ -42,7 +42,6 @@ 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() {
@@ -846,13 +845,6 @@ 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;

world/zonelist.h

@@ -72,7 +72,6 @@ public:
 
 private:
 	void OnTick(EQ::Timer *t);
-	void OnKeepAlive(EQ::Timer *t);
 	uint32 NextID;
 	uint16	pLockedZones[MaxLockedZones];
 	uint32 CurGroupID;

world/zoneserver.cpp

@@ -1564,11 +1564,6 @@ 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);

zone/attack.cpp

@@ -1550,10 +1550,7 @@ 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(
 					"{} {}",
@@ -3078,10 +3075,7 @@ 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(
 				"{} {} {} {} {} {} {} {} {}",
@@ -3096,8 +3090,7 @@ 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)
@@ -4266,10 +4259,7 @@ 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(
 						"{} {} {} {} {} {} {} {} {}",
@@ -4284,17 +4274,13 @@ 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(
 					"{} {} {} {} {} {} {} {} {}",
@@ -4309,8 +4295,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
 					static_cast<int>(special)
 				);
 			},
-			0,
-			&args
+			0, &args
 		);
 
 		if (damage_override > 0) {

zone/bot.cpp

@@ -1265,7 +1265,7 @@ void Bot::LoadAAs() {
 		}
 
 		while(current) {
-			if (!CanUseAlternateAdvancementRank(current)) {
+			if (current->level_req > GetLevel() || !CanUseAlternateAdvancementRank(current)) {
 				current = nullptr;
 			} else {
 				current = current->next;
@@ -3089,6 +3089,7 @@ bool Bot::Spawn(Client* botCharacterOwner) {
 		m_targetable = true;
 		entity_list.AddBot(this, true, true);
 
+		ClearDataBucketCache();
 		DataBucket::GetDataBuckets(this);
 		LoadBotSpellSettings();
 		if (!AI_AddBotSpells(GetBotSpellID())) {
@@ -4192,14 +4193,7 @@ 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) {
@@ -4264,14 +4258,7 @@ 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

zone/client.cpp

@@ -329,7 +329,7 @@ Client::Client(EQStreamInterface *ieqs) : Mob(
 	adventure_stats_timer = nullptr;
 	adventure_leaderboard_timer = nullptr;
 	adv_data = nullptr;
-	adv_requested_theme = LDoNThemes::Unused;
+	adv_requested_theme = LDoNTheme::Unused;
 	adv_requested_id = 0;
 	adv_requested_member_count = 0;
 
@@ -534,7 +534,7 @@ void Client::SendZoneInPackets()
 	if (GetLevel() >= 51)
 		SendAlternateAdvancementStats();
 
-	
+	// Send exp packets
 	outapp = new EQApplicationPacket(OP_ExpUpdate, sizeof(ExpUpdate_Struct));
 	ExpUpdate_Struct* eu = (ExpUpdate_Struct*)outapp->pBuffer;
 	uint32 tmpxp1 = GetEXPForLevel(GetLevel() + 1);
@@ -1168,7 +1168,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 			}
 		}
 
-		if (message[0] == COMMAND_CHAR || message[0] == COMMAND_CHAR_NON_HASH) {
+		if (message[0] == COMMAND_CHAR) {
 			if (command_dispatch(this, message, false) == -2) {
 				if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
 					int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
@@ -1469,7 +1469,7 @@ bool Client::UpdateLDoNPoints(uint32 theme_id, int points)
 	bool is_loss = false;
 
 	switch (theme_id) {
-		case LDoNThemes::Unused: { // No theme, so distribute evenly across all
+		case LDoNTheme::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(LDoNThemes::Unused, split_points);
+				UpdateLDoNPoints(LDoNTheme::Unused, split_points);
 			}
 
 			break;
 		}
-		case LDoNThemes::GUK: {
+		case LDoNTheme::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 LDoNThemes::MIR: {
+		case LDoNTheme::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 LDoNThemes::MMC: {
+		case LDoNTheme::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 LDoNThemes::RUJ: {
+		case LDoNTheme::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 LDoNThemes::TAK: {
+		case LDoNTheme::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 LDoNThemes::GUK: {
+		case LDoNTheme::GUK: {
 			m_pp.ldon_points_guk = points;
 			break;
 		}
-		case LDoNThemes::MIR: {
+		case LDoNTheme::MIR: {
 			m_pp.ldon_points_mir = points;
 			break;
 		}
-		case LDoNThemes::MMC: {
+		case LDoNTheme::MMC: {
 			m_pp.ldon_points_mmc = points;
 			break;
 		}
-		case LDoNThemes::RUJ: {
+		case LDoNTheme::RUJ: {
 			m_pp.ldon_points_ruj = points;
 			break;
 		}
-		case LDoNThemes::TAK: {
+		case LDoNTheme::TAK: {
 			m_pp.ldon_points_tak = points;
 			break;
 		}
@@ -5676,15 +5676,15 @@ uint32 Client::GetLDoNPointsTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNThemes::GUK:
+	case LDoNTheme::GUK:
 		return m_pp.ldon_points_guk;
-	case LDoNThemes::MIR:
+	case LDoNTheme::MIR:
 		return m_pp.ldon_points_mir;
-	case LDoNThemes::MMC:
+	case LDoNTheme::MMC:
 		return m_pp.ldon_points_mmc;
-	case LDoNThemes::RUJ:
+	case LDoNTheme::RUJ:
 		return m_pp.ldon_points_ruj;
-	case LDoNThemes::TAK:
+	case LDoNTheme::TAK:
 		return m_pp.ldon_points_tak;
 	default:
 		return 0;
@@ -5695,15 +5695,15 @@ uint32 Client::GetLDoNWinsTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNThemes::GUK:
+	case LDoNTheme::GUK:
 		return m_pp.ldon_wins_guk;
-	case LDoNThemes::MIR:
+	case LDoNTheme::MIR:
 		return m_pp.ldon_wins_mir;
-	case LDoNThemes::MMC:
+	case LDoNTheme::MMC:
 		return m_pp.ldon_wins_mmc;
-	case LDoNThemes::RUJ:
+	case LDoNTheme::RUJ:
 		return m_pp.ldon_wins_ruj;
-	case LDoNThemes::TAK:
+	case LDoNTheme::TAK:
 		return m_pp.ldon_wins_tak;
 	default:
 		return 0;
@@ -5714,15 +5714,15 @@ uint32 Client::GetLDoNLossesTheme(uint32 t)
 {
 	switch(t)
 	{
-	case LDoNThemes::GUK:
+	case LDoNTheme::GUK:
 		return m_pp.ldon_losses_guk;
-	case LDoNThemes::MIR:
+	case LDoNTheme::MIR:
 		return m_pp.ldon_losses_mir;
-	case LDoNThemes::MMC:
+	case LDoNTheme::MMC:
 		return m_pp.ldon_losses_mmc;
-	case LDoNThemes::RUJ:
+	case LDoNTheme::RUJ:
 		return m_pp.ldon_losses_ruj;
-	case LDoNThemes::TAK:
+	case LDoNTheme::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 LDoNThemes::GUK:
+		case LDoNTheme::GUK:
 			if (win) {
 				m_pp.ldon_wins_guk += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_guk += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNThemes::MIR:
+		case LDoNTheme::MIR:
 			if (win) {
 				m_pp.ldon_wins_mir += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_mir += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNThemes::MMC:
+		case LDoNTheme::MMC:
 			if (win) {
 				m_pp.ldon_wins_mmc += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_mmc += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNThemes::RUJ:
+		case LDoNTheme::RUJ:
 			if (win) {
 				m_pp.ldon_wins_ruj += (remove ? -1 : 1);
 			} else {
 				m_pp.ldon_losses_ruj += (remove ? -1 : 1);
 			}
 			break;
-		case LDoNThemes::TAK:
+		case LDoNTheme::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 = LDoNThemes::Unused;
+	adv_requested_theme = LDoNTheme::Unused;
 	safe_delete_array(adv_requested_data);
 	adv_requested_member_count = 0;
 }
@@ -7518,7 +7518,7 @@ void Client::GarbleMessage(char *message, uint8 variance)
 	int delimiter_count = 0;
 
 	// Don't garble # commands
-	if (message[0] == COMMAND_CHAR || message[0] == COMMAND_CHAR_NON_HASH || message[0] == BOT_COMMAND_CHAR) {
+	if (message[0] == COMMAND_CHAR || message[0] == BOT_COMMAND_CHAR) {
 		return;
 	}
 
@@ -8593,44 +8593,6 @@ void Client::SendHPUpdateMarquee(){
 	SendMarqueeMessage(Chat::Yellow, 510, 0, 3000, 3000, health_update_notification);
 }
 
-void Client::SendMembership() {
-	if (m_ClientVersion >= EQ::versions::ClientVersion::Laurion) {
-		auto outapp = new EQApplicationPacket(OP_SendMembership, sizeof(Membership_Struct));
-		Membership_Struct* mc = (Membership_Struct*)outapp->pBuffer;
-
-		mc->membership = 2;				//Hardcode to gold for now. We don't use anything else.
-		mc->races = 0x1ffff;			// Available Races (4110 for silver)
-		mc->classes = 0x1ffff;			// Available Classes (4614 for silver) - Was 0x101ffff
-		mc->entrysize = 21;				// Number of membership setting entries below
-		mc->entries[0] = 0xffffffff;	// Max AA Restriction
-		mc->entries[1] = 0xffffffff;	// Max Level Restriction
-		mc->entries[2] = 0xffffffff;	// Max Char Slots per Account (not used by client?)
-		mc->entries[3] = 0xffffffff;	// 1 for Silver
-		mc->entries[4] = 0xffffffff;	// Main Inventory Size (0xffffffff on Live for Gold, but limiting to 8 until 10 is supported)
-		mc->entries[5] = 0xffffffff;	// Max Platinum per level
-		mc->entries[6] = 1;				// 0 for Silver
-		mc->entries[7] = 1;				// 0 for Silver
-		mc->entries[8] = 1;				// 1 for Silver
-		mc->entries[9] = 0xffffffff;	// Unknown - Maybe Loyalty Points every 12 hours? 60 per week for Silver
-		mc->entries[10] = 1;			// 1 for Silver
-		mc->entries[11] = 0xffffffff;	// Shared Bank Slots
-		mc->entries[12] = 0xffffffff;	// Unknown - Maybe Max Active Tasks?
-		mc->entries[13] = 1;			// 1 for Silver
-		mc->entries[14] = 1;			// 0 for Silver
-		mc->entries[15] = 1;			// 0 for Silver
-		mc->entries[16] = 1;			// 1 for Silver
-		mc->entries[17] = 1;			// 0 for Silver
-		mc->entries[18] = 1;			// 0 for Silver
-		mc->entries[19] = 0xffffffff;	// 0 for Silver
-		mc->entries[20] = 0xffffffff;	// 0 for Silver
-		mc->exit_url_length = 0;
-		//mc->exit_url = 0; // Used on Live: "http://www.everquest.com/free-to-play/exit-silver"
-
-		QueuePacket(outapp);
-		safe_delete(outapp);
-	}
-}
-
 uint32 Client::GetMoney(uint8 type, uint8 subtype) {
 	uint32 value = 0;
 
@@ -10499,27 +10461,15 @@ void Client::SendToInstance(std::string instance_type, std::string zone_short_na
 	MovePC(zone_id, instance_id, x, y, z, heading);
 }
 
-int Client::CountItem(uint32 item_id)
+uint32 Client::CountItem(uint32 item_id)
 {
-	int quantity = 0;
+	uint32 quantity = 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 },
-	};
-	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);
-			}
+
+	for (const int16& slot_id : GetInventorySlots()) {
+		item = GetInv().GetItem(slot_id);
+		if (item && item->GetID() == item_id) {
+			quantity += (item->IsStackable() ? item->GetCharges() : 1);
 		}
 	}
 
@@ -10536,30 +10486,26 @@ void Client::ResetItemCooldown(uint32 item_id)
 	int recast_type = item_d->RecastType;
 	bool found_item = false;
 
-	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;
-				}
+	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;
 			}
 		}
 	}
+
 	if (!found_item) {
 		DeleteItemRecastTimer(item_id); //We didn't find the item but we still want to remove the timer
 	}
@@ -10594,25 +10540,20 @@ void Client::SetItemCooldown(uint32 item_id, bool use_saved_timer, uint32 in_sec
 		final_time = total_time - current_time;
 	}
 
-	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);
-				}
+	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);
 			}
 		}
 	}
@@ -10655,38 +10596,26 @@ 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;
-			}
 
-			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);
-					}
+	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);
 				}
 			}
 		}
@@ -12858,37 +12787,28 @@ 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;
-			}
 
-			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);
-					}
+	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);
 				}
 			}
 		}
@@ -13113,3 +13033,28 @@ 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;
+}

zone/client.h

@@ -467,6 +467,7 @@ 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; }
@@ -1093,7 +1094,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);
-	int CountItem(uint32 item_id);
+	uint32 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);
@@ -1786,7 +1787,6 @@ public:
 	void ResetHPUpdateTimer() { hpupdate_timer.Start(); }
 
 	void SendHPUpdateMarquee();
-	void SendMembership();
 
 	void CheckRegionTypeChanges();
 

zone/client_packet.cpp

@@ -118,6 +118,7 @@ void MapOpcodes()
 	ConnectingOpcodes[OP_ZoneEntry] = &Client::Handle_Connect_OP_ZoneEntry;
 
 	// connected opcode handler assignments:
+	ConnectedOpcodes[OP_0x0193] = &Client::Handle_0x0193;
 	ConnectedOpcodes[OP_AAAction] = &Client::Handle_OP_AAAction;
 	ConnectedOpcodes[OP_AcceptNewTask] = &Client::Handle_OP_AcceptNewTask;
 	ConnectedOpcodes[OP_AdventureInfoRequest] = &Client::Handle_OP_AdventureInfoRequest;
@@ -523,7 +524,6 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 // Finish client connecting state
 void Client::CompleteConnect()
 {
-
 	UpdateWho();
 	client_state = CLIENT_CONNECTED;
 	SendAllPackets();
@@ -860,7 +860,7 @@ void Client::CompleteConnect()
 	if (IsInAGuild()) {
 		if (firstlogon == 1) {
 			guild_mgr.UpdateDbMemberOnline(CharacterID(), true);
-			guild_mgr.SendToWorldSendGuildMembersList(GuildID());
+			SendGuildMembersList();
 		}
 
 		guild_mgr.SendGuildMemberUpdateToWorld(GetName(), GuildID(), zone->GetZoneID(), time(nullptr));
@@ -912,10 +912,6 @@ 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()) {
@@ -1202,6 +1198,10 @@ void Client::Handle_Connect_OP_WorldObjectsSent(const EQApplicationPacket *app)
 
 void Client::Handle_Connect_OP_ZoneComplete(const EQApplicationPacket *app)
 {
+	auto outapp = new EQApplicationPacket(OP_0x0347, 0);
+	QueuePacket(outapp);
+	safe_delete(outapp);
+	return;
 }
 
 void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
@@ -1408,6 +1408,7 @@ 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
@@ -1650,7 +1651,9 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	if ((m_pp.RestTimer > RuleI(Character, RestRegenTimeToActivate)) && (m_pp.RestTimer > RuleI(Character, RestRegenRaidTimeToActivate)))
 		m_pp.RestTimer = 0;
 
-	SendMembership();
+	/* This checksum should disappear once dynamic structs are in... each struct strategy will do it */ // looks to be in place now
+	//CRC32::SetEQChecksum((unsigned char*)&m_pp, sizeof(PlayerProfile_Struct) - sizeof(m_pp.m_player_profile_version) - 4);
+	// m_pp.checksum = 0; // All server out-bound player profile packets are now translated - no need to waste cycles calculating this...
 
 	outapp = new EQApplicationPacket(OP_PlayerProfile, sizeof(PlayerProfile_Struct));
 
@@ -1827,6 +1830,16 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	return;
 }
 
+// connected opcode handlers
+void Client::Handle_0x0193(const EQApplicationPacket *app)
+{
+	// Not sure what this opcode does. It started being sent when OP_ClientUpdate was
+	// changed to pump OP_ClientUpdate back out instead of OP_MobUpdate
+	// 2 bytes: 00 00
+
+	return;
+}
+
 void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 {
 	LogAA("Received OP_AAAction");
@@ -2006,38 +2019,38 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			return;
 		}
 
-		if (item->LDoNTheme <= LDoNThemeBits::TAKBit) {
+		if (item->LDoNTheme <= LDoNTheme::TAKBit) {
 			uint32 ldon_theme;
-			if (item->LDoNTheme & LDoNThemeBits::TAKBit) {
+			if (item->LDoNTheme & LDoNTheme::TAKBit) {
 				if (m_pp.ldon_points_tak < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNThemes::TAK;
+					ldon_theme = LDoNTheme::TAK;
 				}
-			} else if (item->LDoNTheme & LDoNThemeBits::RUJBit) {
+			} else if (item->LDoNTheme & LDoNTheme::RUJBit) {
 				if (m_pp.ldon_points_ruj < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNThemes::RUJ;
+					ldon_theme = LDoNTheme::RUJ;
 				}
-			} else if (item->LDoNTheme & LDoNThemeBits::MMCBit) {
+			} else if (item->LDoNTheme & LDoNTheme::MMCBit) {
 				if (m_pp.ldon_points_mmc < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNThemes::MMC;
+					ldon_theme = LDoNTheme::MMC;
 				}
-			} else if (item->LDoNTheme & LDoNThemeBits::MIRBit) {
+			} else if (item->LDoNTheme & LDoNTheme::MIRBit) {
 				if (m_pp.ldon_points_mir < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNThemes::MIR;
+					ldon_theme = LDoNTheme::MIR;
 				}
-			} else if (item->LDoNTheme & LDoNThemeBits::GUKBit) {
+			} else if (item->LDoNTheme & LDoNTheme::GUKBit) {
 				if (m_pp.ldon_points_guk < item_cost) {
 					cannot_afford = true;
-					ldon_theme = LDoNThemes::GUK;
+					ldon_theme = LDoNTheme::GUK;
 				}
 			}
 
 			merchant_type = fmt::format(
 				"{} Point{}",
-				EQ::constants::GetLDoNThemeName(ldon_theme),
+				LDoNTheme::GetName(ldon_theme),
 				item_cost != 1 ? "s" : ""
 			);
 		}
@@ -2181,19 +2194,19 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)
 
 		item = database.GetItem(ml.item);
 		if (item) {
-			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;
+			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;
 			}
 			ss << "^" << item->Name << "|";
 			ss << item->ID << "|";
@@ -3234,30 +3247,14 @@ 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)) {
@@ -3289,29 +3286,13 @@ 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);
@@ -3381,30 +3362,14 @@ 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);
@@ -3469,30 +3434,14 @@ 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);
@@ -3968,6 +3917,10 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app)
 			SendBazaarWelcome();
 			break;
 		}
+		case FirstOpenSearch: {
+			SendBulkBazaarTraders();
+			break;
+		}
 		default: {
 			LogError("Malformed BazaarSearch_Struct packet received, ignoring\n");
 		}
@@ -4317,23 +4270,13 @@ void Client::Handle_OP_Camp(const EQApplicationPacket *app)
 	if (IsLFP())
 		worldserver.StopLFP(CharacterID());
 
-	if (ClientVersion() >= EQ::versions::ClientVersion::Laurion) {
-		if (!GetGM()) {
-			camp_timer.Start(29000, true);
-		}
-
-		auto outapp = new EQApplicationPacket(OP_Camp, 1);
-		FastQueuePacket(&outapp);
-	}
-	else {
-		if (GetGM())
-		{
-			OnDisconnect(true);
-			return;
-		}
-
-		camp_timer.Start(29000, true);
+	if (GetGM())
+	{
+		OnDisconnect(true);
+		return;
 	}
+	camp_timer.Start(29000, true);
+	return;
 }
 
 void Client::Handle_OP_CancelTask(const EQApplicationPacket *app)
@@ -4472,14 +4415,7 @@ 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)) {
@@ -4511,14 +4447,7 @@ 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)) {
@@ -8008,6 +7937,7 @@ 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();
 
@@ -9584,14 +9514,7 @@ 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)) {
@@ -9655,14 +9578,7 @@ 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)) {
@@ -14639,10 +14555,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 		mco->rate = 1 / buy_cost_mod;
 	}
 
-	if (m_ClientVersion >= EQ::versions::ClientVersion::Laurion) {
-		mco->player_id = GetID();
-	}
-
+	outapp->priority = 6;
 	QueuePacket(outapp);
 	safe_delete(outapp);
 

zone/client_packet.h

@@ -21,6 +21,8 @@
 	void Handle_Connect_OP_ZoneComplete(const EQApplicationPacket *app);
 	void Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app);
 	/* Connected opcode handlers*/
+	void Handle_0x0193(const EQApplicationPacket *app);
+	void Handle_0x01e7(const EQApplicationPacket *app);
 	void Handle_OP_AAAction(const EQApplicationPacket *app);
 	void Handle_OP_AcceptNewTask(const EQApplicationPacket *app);
 	void Handle_OP_AdventureInfoRequest(const EQApplicationPacket *app);

zone/client_process.cpp

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

zone/command.h

@@ -8,7 +8,6 @@ class Seperator;
 #include <string>
 
 #define    COMMAND_CHAR '#'
-#define    COMMAND_CHAR_NON_HASH '$'
 
 typedef void (*CmdFuncPtr)(Client *, const Seperator *);
 

zone/corpse.cpp

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

zone/corpse.h

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

zone/data_bucket.cpp

@@ -8,7 +8,7 @@
 
 extern WorldServer worldserver;
 
-std::vector<DataBucketCacheEntry> g_data_bucket_cache = {};
+std::vector<DataBucketsRepository::DataBuckets> 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) {
-		// 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;
+
+		// update the cache if it exists
+		if (CanCache(k)) {
+			for (auto &e: g_data_bucket_cache) {
+				if (CheckBucketMatch(e, k)) {
+					e = b;
+					break;
+				}
 			}
 		}
 
@@ -74,28 +74,18 @@ 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)
 {
-	DataBucketKey k = {};
-	k.key = bucket_key;
-	return GetData(k).value;
+	return GetData(DataBucketKey{.key = bucket_key}).value;
 }
 
 // GetData fetches bucket data from the database or cache if it exists
@@ -112,22 +102,27 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 		k.npc_id
 	);
 
-	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();
-			}
+	bool can_cache = CanCache(k);
 
-			// 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();
-			}
+	// 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();
+				}
 
-			LogDataBuckets("Returning key [{}] value [{}] from cache", ce.e.key_, ce.e.value);
-			return ce.e;
+				// 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;
+			}
 		}
 	}
 
@@ -144,23 +139,21 @@ 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
-		if (!ignore_misses_cache) {
+		bool add_to_misses_cache = !ignore_misses_cache && can_cache;
+		if (add_to_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(
-				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()
+				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
 				}
 			);
 
@@ -178,60 +171,54 @@ DataBucketsRepository::DataBuckets DataBucket::GetData(const DataBucketKey &k, b
 		return {};
 	}
 
+	auto bucket = r.front();
+
 	// if the entry has expired, delete it
-	if (r[0].expires > 0 && r[0].expires < (long long) std::time(nullptr)) {
+	if (bucket.expires > 0 && bucket.expires < (long long) std::time(nullptr)) {
 		DeleteData(k);
 		return {};
 	}
 
-	bool      has_cache = false;
-	for (auto &ce: g_data_bucket_cache) {
-		if (ce.e.id == r[0].id) {
-			has_cache = true;
-			break;
+	// 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);
 		}
 	}
 
-	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];
+	return bucket;
 }
 
 std::string DataBucket::GetDataExpires(const std::string &bucket_key)
 {
-	DataBucketKey k = {};
-	k.key = bucket_key;
-
-	return GetDataExpires(k);
+	return GetDataExpires(DataBucketKey{.key = bucket_key});
 }
 
 std::string DataBucket::GetDataRemaining(const std::string &bucket_key)
 {
-	DataBucketKey k = {};
-	k.key = bucket_key;
-	return GetDataRemaining(k);
+	return GetDataRemaining(DataBucketKey{.key = bucket_key});
 }
 
 bool DataBucket::DeleteData(const std::string &bucket_key)
 {
-	DataBucketKey k = {};
-	k.key = bucket_key;
-	return DeleteData(k);
+	return DeleteData(DataBucketKey{.key = bucket_key});
 }
 
 // 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;
@@ -243,46 +230,39 @@ bool DataBucket::GetDataBuckets(Mob *mob)
 	else if (mob->IsClient()) {
 		t = DataBucketLoadType::Client;
 	}
-	else if (mob->IsNPC()) {
-		t = DataBucketLoadType::NPC;
-	}
 
-	BulkLoadEntities(t, {id});
+	BulkLoadEntitiesToCache(t, {id});
 
 	return true;
 }
 
 bool DataBucket::DeleteData(const DataBucketKey &k)
 {
-	size_t size_before = g_data_bucket_cache.size();
+	if (CanCache(k)) {
+		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(),
-			[&](DataBucketCacheEntry &ce) {
-				bool match = CheckBucketMatch(ce.e, k);
-				if (match) {
-					ce.update_action = DataBucketCacheUpdateAction::Delete;
-					SendDataBucketCacheUpdate(ce);
+		// 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);
 				}
+			),
+			g_data_bucket_cache.end()
+		);
 
-				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()
-	);
+		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,
@@ -371,23 +351,21 @@ bool DataBucket::CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe,
 	);
 }
 
-void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32> ids)
+void DataBucket::BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector<uint32> ids)
 {
 	if (ids.empty()) {
 		return;
 	}
 
 	if (ids.size() == 1) {
-		bool            has_cache = false;
-		for (const auto &ce: g_data_bucket_cache) {
+		bool has_cache = false;
+
+		for (const auto &e: g_data_bucket_cache) {
 			if (t == DataBucketLoadType::Bot) {
-				has_cache = ce.e.bot_id == ids[0];
+				has_cache = e.bot_id == ids[0];
 			}
 			else if (t == DataBucketLoadType::Client) {
-				has_cache = ce.e.character_id == ids[0];
-			}
-			else if (t == DataBucketLoadType::NPC) {
-				has_cache = ce.e.npc_id == ids[0];
+				has_cache = e.character_id == ids[0];
 			}
 		}
 
@@ -406,9 +384,6 @@ void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32
 		case DataBucketLoadType::Client:
 			column = "character_id";
 			break;
-		case DataBucketLoadType::NPC:
-			column = "npc_id";
-			break;
 		default:
 			LogError("Incorrect LoadType [{}]", static_cast<int>(t));
 			break;
@@ -442,12 +417,7 @@ void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32
 		if (!ExistsInCache(e)) {
 			LogDataBucketsDetail("bucket id [{}] bucket key [{}] bucket value [{}]", e.id, e.key_, e.value);
 
-			g_data_bucket_cache.emplace_back(
-				DataBucketCacheEntry{
-					.e = e,
-					.updated_time = GetCurrentTimeUNIX()
-				}
-			);
+			g_data_bucket_cache.emplace_back(e);
 		}
 	}
 
@@ -461,7 +431,7 @@ void DataBucket::BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32
 	);
 }
 
-void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id)
+void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type type, uint32 id)
 {
 	size_t size_before = g_data_bucket_cache.size();
 
@@ -469,11 +439,10 @@ void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id)
 		std::remove_if(
 			g_data_bucket_cache.begin(),
 			g_data_bucket_cache.end(),
-			[&](DataBucketCacheEntry &ce) {
+			[&](DataBucketsRepository::DataBuckets &e) {
 				return (
-					(t == DataBucketLoadType::Bot && ce.e.bot_id == id) ||
-					(t == DataBucketLoadType::Client && ce.e.character_id == id) ||
-					(t == DataBucketLoadType::NPC && ce.e.npc_id == id)
+					(type == DataBucketLoadType::Bot && e.bot_id == id) ||
+					(type == DataBucketLoadType::Client && e.character_id == id)
 				);
 			}
 		),
@@ -482,24 +451,17 @@ void DataBucket::DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id)
 
 	LogDataBuckets(
 		"LoadType [{}] id [{}] cache size before [{}] after [{}]",
-		DataBucketLoadType::Name[t],
+		DataBucketLoadType::Name[type],
 		id,
 		size_before,
 		g_data_bucket_cache.size()
 	);
 }
 
-int64_t DataBucket::GetCurrentTimeUNIX()
+bool DataBucket::ExistsInCache(const DataBucketsRepository::DataBuckets &entry)
 {
-	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) {
+	for (const auto &e: g_data_bucket_cache) {
+		if (e.id == entry.id) {
 			return true;
 		}
 	}
@@ -507,134 +469,6 @@ bool DataBucket::ExistsInCache(const DataBucketsRepository::DataBuckets &e)
 	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
@@ -645,11 +479,11 @@ void DataBucket::DeleteFromMissesCache(DataBucketsRepository::DataBuckets e)
 		std::remove_if(
 			g_data_bucket_cache.begin(),
 			g_data_bucket_cache.end(),
-			[&](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;
+			[&](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;
 			}
 		),
 		g_data_bucket_cache.end()
@@ -667,3 +501,47 @@ 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;
+}

zone/data_bucket.h

@@ -1,7 +1,3 @@
-//
-// Created by Akkadius on 7/7/18.
-//
-
 #ifndef EQEMU_DATABUCKET_H
 #define EQEMU_DATABUCKET_H
 
@@ -12,27 +8,6 @@
 #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;
@@ -46,14 +21,12 @@ namespace DataBucketLoadType {
 	enum Type : uint8 {
 		Bot,
 		Client,
-		NPC,
 		MaxType
 	};
 
 	static const std::string Name[Type::MaxType] = {
 		"Bot",
 		"Client",
-		"NPC",
 	};
 }
 
@@ -68,8 +41,6 @@ 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);
@@ -80,15 +51,15 @@ public:
 
 	// bucket repository versus key matching
 	static bool CheckBucketMatch(const DataBucketsRepository::DataBuckets &dbe, const DataBucketKey &k);
-	static bool ExistsInCache(const DataBucketsRepository::DataBuckets &e);
+	static bool ExistsInCache(const DataBucketsRepository::DataBuckets &entry);
 
-	static void BulkLoadEntities(DataBucketLoadType::Type t, std::vector<uint32> ids);
-	static void DeleteCachedBuckets(DataBucketLoadType::Type t, uint32 id);
+	static void BulkLoadEntitiesToCache(DataBucketLoadType::Type t, std::vector<uint32> ids);
+	static void DeleteCachedBuckets(DataBucketLoadType::Type type, 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

zone/embparser_api.cpp

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

zone/entity.cpp

@@ -1817,25 +1817,13 @@ 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);
 		}
 	}
 

zone/exp.cpp

@@ -657,12 +657,7 @@ void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool
 				} else if (zone->IsHotzone()) {
 					Message(Chat::Experience, "You gain party experience (with a bonus)!");
 				} else {
-					if (m_ClientVersion >= EQ::versions::ClientVersion::Laurion) {
-						MessageString(Chat::Experience, GAIN_GROUPXP, exp_percent_message.c_str());
-					}
-					else {
-						MessageString(Chat::Experience, GAIN_GROUPXP);
-					}
+					MessageString(Chat::Experience, GAIN_GROUPXP);
 				}
 			} else if (IsRaidGrouped()) {
 				if (RuleI(Character, ShowExpValues) > 0) {
@@ -670,12 +665,7 @@ void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool
 				} else if (zone->IsHotzone()) {
 					Message(Chat::Experience, "You gained raid experience (with a bonus)!");
 				} else {
-					if (m_ClientVersion >= EQ::versions::ClientVersion::Laurion) {
-						MessageString(Chat::Experience, GAIN_RAIDEXP, exp_percent_message.c_str());
-					}
-					else {
-						MessageString(Chat::Experience, GAIN_RAIDEXP);
-					}
+					MessageString(Chat::Experience, GAIN_RAIDEXP);
 				}
 			} else {
 				if (RuleI(Character, ShowExpValues) > 0) {
@@ -683,12 +673,7 @@ void Client::SetEXP(ExpSource exp_source, uint64 set_exp, uint64 set_aaxp, bool
 				} else if (zone->IsHotzone()) {
 					Message(Chat::Experience, "You gain experience (with a bonus)!");
 				} else {
-					if (m_ClientVersion >= EQ::versions::ClientVersion::Laurion) {
-						MessageString(Chat::Experience, GAIN_XP, exp_percent_message.c_str());
-					}
-					else {
-						MessageString(Chat::Experience, GAIN_XP);
-					}
+					MessageString(Chat::Experience, GAIN_XP);
 				}
 			}
 		}

zone/gm_commands/emptyinventory.cpp

@@ -2,31 +2,21 @@
 
 void command_emptyinventory(Client *c, const Seperator *sep)
 {
-	auto target = c;
+	Client* t = c;
 	if (c->GetGM() && c->GetTarget() && c->GetTarget()->IsClient()) {
-		target = c->GetTarget()->CastToClient();
+		t = c->GetTarget()->CastToClient();
 	}
 
 	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::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);
-			}
+	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);
 		}
 	}
 
@@ -35,8 +25,8 @@ void command_emptyinventory(Client *c, const Seperator *sep)
 			Chat::White,
 			fmt::format(
 				"{} {} no items to delete.",
-				c->GetTargetDescription(target, TargetDescriptionType::UCYou),
-				c == target ? "have" : "has"
+				c->GetTargetDescription(t, TargetDescriptionType::UCYou),
+				c == t ? "have" : "has"
 			).c_str()
 		);
 		return;
@@ -46,9 +36,9 @@ void command_emptyinventory(Client *c, const Seperator *sep)
 		Chat::White,
 		fmt::format(
 			"Inventory cleared for {}, {} item{} deleted.",
-			c->GetTargetDescription(target),
+			c->GetTargetDescription(t),
 			removed_count,
 			removed_count != 1 ? "s" : ""
 		).c_str()
 	);
-}
+}

zone/gm_commands/find.cpp

@@ -1,6 +1,7 @@
 #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"
@@ -11,6 +12,7 @@
 #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"
@@ -47,6 +49,7 @@ 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",
@@ -65,6 +68,16 @@ 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) {

zone/gm_commands/find/bot.cpp

@@ -0,0 +1,95 @@
+#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()
+	);
+}
+

zone/gm_commands/find/character.cpp

@@ -36,7 +36,7 @@ void FindCharacter(Client *c, const Seperator *sep)
 	const auto& l = CharacterDataRepository::GetWhere(
 		content_db,
 		fmt::format(
-			"LOWER(`name`) LIKE '%%{}%%' ORDER BY `id` ASC LIMIT 50",
+			"LOWER(`name`) LIKE '%%{}%%' AND `name` NOT LIKE '%-deleted-%' ORDER BY `id` ASC LIMIT 50",
 			search_criteria
 		)
 	);

zone/gm_commands/find/class.cpp

@@ -57,7 +57,7 @@ void FindClass(Client *c, const Seperator *sep)
 				(
 					IsPlayerClass(class_id) ?
 					fmt::format(
-						" | ({})",
+						" ({})",
 						Strings::Commify(GetPlayerClassBit(class_id))
 					) :
 					""

zone/gm_commands/find/ldon_theme.cpp

@@ -0,0 +1,65 @@
+#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()
+	);
+}
+