pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 10:22:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add expired lockouts leeway rule

Browse Source 
Adds a rule for leeway with expired lockouts during creation requests

The client removes lockout timers with under 60s remaining from the
window. This allows a small leeway to compensate so players don't
request an expedition that has visually hidden lockouts.
This commit is contained in:
hg 2020-05-14 19:09:49 -04:00
parent af766dd323
commit 11181190ee
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/ruletypes.h
View File

@ -790,6 +790,7 @@ RULE_INT(Expedition, MinStatusToBypassPlayerCountRequirements, 80, "Minimum GM s
RULE_BOOL(Expedition, UseDatabaseToVerifyLeaderCommands, false, "Use database instead of zone cache to verify Expedition leader for commands") RULE_BOOL(Expedition, UseDatabaseToVerifyLeaderCommands, false, "Use database instead of zone cache to verify Expedition leader for commands")
RULE_BOOL(Expedition, EmptyDzShutdownEnabled, true, "Enable early instance shutdown after last member of expedition removed") RULE_BOOL(Expedition, EmptyDzShutdownEnabled, true, "Enable early instance shutdown after last member of expedition removed")
RULE_INT(Expedition, EmptyDzShutdownDelaySeconds, 900, "Seconds to set dynamic zone instance expiration if early shutdown enabled") RULE_INT(Expedition, EmptyDzShutdownDelaySeconds, 900, "Seconds to set dynamic zone instance expiration if early shutdown enabled")
RULE_INT(Expedition, RequestExpiredLockoutLeewaySeconds, 60, "Seconds remaining on lockout to count as expired for creation requests (client hides timers under 60s remaining)")
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY(DynamicZone) RULE_CATEGORY(DynamicZone)

57
zone/expedition_request.cpp
View File

@ -199,15 +199,25 @@ bool ExpeditionRequest::LoadLeaderLockouts()
{ {
uint64_t expire_time = strtoull(row[0], nullptr, 10); uint64_t expire_time = strtoull(row[0], nullptr, 10);
uint32_t duration = strtoul(row[1], nullptr, 10); uint32_t duration = strtoul(row[1], nullptr, 10);
ExpeditionLockoutTimer lockout{m_expedition_name, row[2], expire_time, duration, true};
m_lockouts.emplace(row[2], ExpeditionLockoutTimer{ // client window hides timers with less than 60s remaining, optionally count them as expired
m_expedition_name, row[2], expire_time, duration, true if (lockout.GetSecondsRemaining() <= RuleI(Expedition, RequestExpiredLockoutLeewaySeconds))
});
// on live if leader has a replay lockout it never bothers checking for event conflicts
if (m_check_event_lockouts && m_has_replay_timer && strcmp(row[2], DZ_REPLAY_TIMER_NAME) == 0)
{ {
m_check_event_lockouts = false; LogExpeditionsModerate(
"Ignoring leader [{}] lockout [{}] with [{}] seconds remaining due to expired leeway rule",
m_leader_id, lockout.GetEventName(), lockout.GetSecondsRemaining()
);
}
else
{
m_lockouts.emplace(row[2], lockout);
// on live if leader has a replay lockout it never bothers checking for event conflicts
if (m_check_event_lockouts && m_has_replay_timer && strcmp(row[2], DZ_REPLAY_TIMER_NAME) == 0)
{
m_check_event_lockouts = false;
}
} }
} }
@ -265,22 +275,33 @@ bool ExpeditionRequest::CheckMembersForConflicts(MySQLRequestResult& results, bo
ExpeditionLockoutTimer lockout(m_expedition_name, event_name, expire_time, original_duration); ExpeditionLockoutTimer lockout(m_expedition_name, event_name, expire_time, original_duration);
// replay timer conflict messages always show up before event conflicts // client window hides timers with less than 60s remaining, optionally count them as expired
if (/*m_has_replay_timer && */event_name == DZ_REPLAY_TIMER_NAME) if (lockout.GetSecondsRemaining() <= RuleI(Expedition, RequestExpiredLockoutLeewaySeconds))
{ {
has_conflicts = true; LogExpeditionsModerate(
SendLeaderMemberReplayLockout(character_name, lockout, is_solo); "Ignoring character [{}] lockout [{}] with [{}] seconds remaining due to expired leeway rule",
// replay timers no longer also show up as event conflicts character_id, lockout.GetEventName(), lockout.GetSecondsRemaining()
//SendLeaderMemberEventLockout(character_name, lockout); );
} }
else if (m_check_event_lockouts && character_id != m_leader_id) else
{ {
if (m_lockouts.find(event_name) == m_lockouts.end()) // replay timer conflict messages always show up before event conflicts
if (/*m_has_replay_timer && */event_name == DZ_REPLAY_TIMER_NAME)
{ {
// leader doesn't have this lockout
// queue instead of messaging now so they come after any replay lockout messages
has_conflicts = true; has_conflicts = true;
member_lockout_conflicts.emplace_back(ExpeditionRequestConflict{character_name, lockout}); SendLeaderMemberReplayLockout(character_name, lockout, is_solo);
// replay timers no longer also show up as event conflicts
//SendLeaderMemberEventLockout(character_name, lockout);
}
else if (m_check_event_lockouts && character_id != m_leader_id)
{
if (m_lockouts.find(event_name) == m_lockouts.end())
{
// leader doesn't have this lockout
// queue instead of messaging now so they come after any replay lockout messages
has_conflicts = true;
member_lockout_conflicts.emplace_back(ExpeditionRequestConflict{character_name, lockout});
}
} }
} }
} }