add grace timer b4 boot out

Vanifac · Jan 11, 2024 · 31ccc8e · 31ccc8e
1 parent c80451f
commit 31ccc8e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/common/ruletypes.h b/common/ruletypes.h
@@ -258,6 +258,7 @@ RULE_BOOL(Quarm, EnforceClassicEraHardCaps, true) // Classic behavior is true, L
 RULE_INT(Quarm, AOEThrottlingMaxAOETargets, 50) // This will curb nonsense with performance issues relating to amount of targets if the amount of clients exceeds 300 in a single zone.
 RULE_INT(Quarm, AOEThrottlingMaxClients, 300) // This will curb nonsense with performance issues relating to amount of targets if the amount of clients exceeds 300 in a single zone.
 RULE_INT(Quarm, EnableLuclinEraShieldACOvercap, false)
+RULE_INT(Quarm, ClientInstanceBootGraceMS, 60000)
 RULE_CATEGORY_END()
 
 RULE_CATEGORY( Map )

diff --git a/zone/client.cpp b/zone/client.cpp
@@ -150,6 +150,7 @@ Client::Client(EQStreamInterface* ieqs)
 	mend_reset_timer(60000),
 	underwater_timer(1000),
 	zoning_timer(5000),
+	instance_boot_grace_timer(RuleI(Quarm, ClientInstanceBootGraceMS)),
 	m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
 	m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f,-2.0f),
 	m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),
@@ -222,6 +223,7 @@ Client::Client(EQStreamInterface* ieqs)
 	door_check_timer.Disable();
 	mend_reset_timer.Disable();
 	zoning_timer.Disable();
+	instance_boot_grace_timer.Disable();
 	instalog = false;
 	m_pp.autosplit = false;
 	// initialise haste variable

diff --git a/zone/client.h b/zone/client.h
@@ -1076,6 +1076,8 @@ class Client : public Mob
 	void CorpseSummoned(Corpse *corpse);
 	void CorpseSummonOnPositionUpdate();
 
+	inline bool InstanceBootGraceTimerExpired() { return instance_boot_grace_timer.Check(); }
+
 protected:
 	friend class Mob;
 	void CalcItemBonuses(StatBonuses* newbon);
@@ -1264,6 +1266,7 @@ class Client : public Mob
 	Timer underwater_timer;
 
 	Timer zoning_timer;
+	Timer instance_boot_grace_timer;
 
     glm::vec3 m_Proximity;
 

diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
@@ -1916,6 +1916,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
+	instance_boot_grace_timer.Start();
 	SetAttackTimer();
 	conn_state = ZoneInfoSent;
 	zoneinpacket_timer.Start();

diff --git a/zone/zone.cpp b/zone/zone.cpp
@@ -2740,7 +2740,7 @@ bool Zone::CanDoCombat(Mob* current, Mob* other, bool process)
 {
 	if (current && other && zone->GetGuildID() != GUILD_NONE)
 	{
-		if (current->IsClient())
+		if (current->IsClient() && current->CastToClient()->InstanceBootGraceTimerExpired())
 		{
 			bool bCanEngage = CanClientEngage(current->CastToClient(), other);
 			if (!bCanEngage)
@@ -2749,7 +2749,7 @@ bool Zone::CanDoCombat(Mob* current, Mob* other, bool process)
 				return false;
 			}
 		}
-		if (other->IsClient())
+		if (other->IsClient() && other->CastToClient()->InstanceBootGraceTimerExpired())
 		{
 			bool bCanEngage = CanClientEngage(other->CastToClient(), current);
 			if (!bCanEngage)