pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hit the zone cache first so we're not hitting the database every time someone attempts to zone

Browse Source
This commit is contained in:
Akkadius 2020-07-18 13:16:27 -05:00
parent 30e0bbb912
commit 880b19cc7f
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zone/zoning.cpp
View File

@ -291,23 +291,47 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
* Expansion check * Expansion check
*/ */
if (content_service.GetCurrentExpansion() >= Expansion::Classic && !GetGM()) { if (content_service.GetCurrentExpansion() >= Expansion::Classic && !GetGM()) {
/**
* Hit the zone cache first so we're not hitting the database every time someone attempts to zone
*/
bool meets_zone_expansion_check = false;
bool found_zone = false;
for (auto &z: zone_store.zones) {
if (z.short_name == target_zone_name && z.version == 0) {
found_zone = true;
if (z.expansion <= (content_service.GetCurrentExpansion() + 1)) {
meets_zone_expansion_check = true;
break;
}
}
}
/**
* If we fail to find a cached zone lookup because someone just so happened to change some data, second attempt
* In 99% of cases we would never get here and this would be fallback
*/
if (!found_zone) {
auto zones = ZoneRepository::GetWhere( auto zones = ZoneRepository::GetWhere(
fmt::format( fmt::format(
"expansion <= {} AND short_name = '{}'", "expansion <= {} AND short_name = '{}' and version = 0",
(content_service.GetCurrentExpansion() + 1), (content_service.GetCurrentExpansion() + 1),
target_zone_name target_zone_name
) )
); );
meets_zone_expansion_check = !zones.empty();
}
LogInfo( LogInfo(
"Checking zone request [{}] for expansion [{}] ({}) success [{}]", "Checking zone request [{}] for expansion [{}] ({}) success [{}]",
target_zone_name, target_zone_name,
(content_service.GetCurrentExpansion() + 1), (content_service.GetCurrentExpansion() + 1),
content_service.GetCurrentExpansionName(), content_service.GetCurrentExpansionName(),
!zones.empty() ? "true" : "false" meets_zone_expansion_check ? "true" : "false"
); );
if (zones.empty()) { if (!meets_zone_expansion_check) {
myerror = ZONE_ERROR_NOEXPANSION; myerror = ZONE_ERROR_NOEXPANSION;
} }
} }