pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some expedition logging and formatting

Browse Source 
Remove logging unsanitized input

Make unsigned comparison not compare < 0

Cleanup some FormatName and string usage. Some of these strings could
probably be moved instead

Remove unnecessary expedition lookup in a world message handler
This commit is contained in:
hg
2020-07-07 18:15:04 -04:00
parent d61879fd3c
commit cb4a117503
6 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+4 -8
View File
@@ -9593,7 +9593,7 @@ Expedition* Client::CreateExpedition(DynamicZone& dz_instance, ExpeditionRequest
}
Expedition* Client::CreateExpedition(
std::string zone_name, uint32 version, uint32 duration, std::string expedition_name,
const std::string& zone_name, uint32 version, uint32 duration, const std::string& expedition_name,
uint32 min_players, uint32 max_players, bool disable_messages)
{
DynamicZone dz_instance{ zone_name, version, duration, DynamicZoneType::Expedition };
@@ -9747,8 +9747,8 @@ void Client::SendExpeditionLockoutTimers()
// erases expired lockouts while building lockout timer list
for (auto it = m_expedition_lockouts.begin(); it != m_expedition_lockouts.end();)
{
auto seconds_remaining = it->GetSecondsRemaining();
if (seconds_remaining <= 0)
uint32_t seconds_remaining = it->GetSecondsRemaining();
if (seconds_remaining == 0)
{
it = m_expedition_lockouts.erase(it);
}
@@ -9933,11 +9933,7 @@ void Client::MovePCDynamicZone(uint32 zone_id)
}
else if (client_dzs.size() == 1)
{
if (single_dz.GetInstanceID() == 0)
{
LogDynamicZones("Character [{}] has dz for zone [{}] with no instance id", CharacterID(), zone_id);
}
else
if (single_dz.IsValid())
{
DynamicZoneLocation zonein = single_dz.GetZoneInLocation();
ZoneMode zone_mode = ZoneMode::ZoneToSafeCoords;