BlueGit

timfa questward

Hard-cap combat-logout so auto-cast cannot extend forever.

Keep the quiet window, but always despawn at disconnect+COMBAT_LOGOUT_MS
even if lastCombatActivityAt keeps refreshing from ongoing fights.

timfa Tim Falken · pushed by timfa

Authored 2026-09-13 · 2 months ago

Hash
3799e5330372b221d01e936322b08cf1d56756b9
Parent
d1e0d89a
2 files changed +20 −8
server/src/simulation/simulation.js +6 −2
@@ -926,8 +926,12 @@ export class Simulation
926 926 for (const [characterId, logout] of [...this.combatLogouts.entries()])
927 927 {
928 928 const track = this.combatTracking.get(characterId);
929 const lastActivity = track?.lastCombatActivityAt ?? logout.startedAt;
930 if ((now - lastActivity) < COMBAT_LOGOUT_MS)
929 const startedAt = logout.startedAt ?? now;
930 const lastActivity = track?.lastCombatActivityAt ?? startedAt;
931 const quietDone = (now - lastActivity) >= COMBAT_LOGOUT_MS;
932 // Hard cap from disconnect so auto-cast / hits cannot extend forever.
933 const hardCapDone = (now - startedAt) >= COMBAT_LOGOUT_MS;
934 if (!quietDone && !hardCapDone)
931 935 { continue; }
932 936 if (logout.pendingCowardice)
933 937 { applyCombatLogoutCowardice(this, characterId, { now }); }
@@ -926,8 +926,12 @@ export class Simulation
926 for (const [characterId, logout] of [...this.combatLogouts.entries()])
926 for (const [characterId, logout] of [...this.combatLogouts.entries()])
927 {
927 {
928 const track = this.combatTracking.get(characterId);
928 const track = this.combatTracking.get(characterId);
929 const lastActivity = track?.lastCombatActivityAt ?? logout.startedAt;
929 const startedAt = logout.startedAt ?? now;
930 if ((now - lastActivity) < COMBAT_LOGOUT_MS)
930 const lastActivity = track?.lastCombatActivityAt ?? startedAt;
931 const quietDone = (now - lastActivity) >= COMBAT_LOGOUT_MS;
932 // Hard cap from disconnect so auto-cast / hits cannot extend forever.
933 const hardCapDone = (now - startedAt) >= COMBAT_LOGOUT_MS;
934 if (!quietDone && !hardCapDone)
931 { continue; }
935 { continue; }
932 if (logout.pendingCowardice)
936 if (logout.pendingCowardice)
933 { applyCombatLogoutCowardice(this, characterId, { now }); }
937 { applyCombatLogoutCowardice(this, characterId, { now }); }
server/tests/combat-logout.test.js +14 −6
@@ -119,7 +119,7 @@ test("combat logout keeps the character until quiet timeout", () =>
119 119 { harness.close(); }
120 120 });
121 121
122 test("combat activity resets the combat-logout quiet timer", () =>
122 test("combat activity delays quiet expiry but hard-caps from disconnect", () =>
123 123 {
124 124 const harness = makeSimulation({ workerCount: 1 });
125 125 try
@@ -133,24 +133,32 @@ test("combat activity resets the combat-logout quiet timer", () =>
133 133 spawnerId: null
134 134 }));
135 135 engageAndLogout(harness, character, playerId, deerId);
136 const logout = harness.simulation.combatLogouts.get(character.character_id);
137 const startedAt = logout.startedAt;
136 138
139 // Fresh combat activity shortly before the quiet window would end.
137 140 harness.advance(COMBAT_LOGOUT_MS - 5_000);
138 141 for (let i = 0; i < 3; i++)
139 142 { harness.simulation.step(); }
140 143 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
141
142 144 const track = harness.simulation.combatTracking.get(character.character_id);
143 145 track.lastCombatActivityAt = harness.now();
144 const logout = harness.simulation.combatLogouts.get(character.character_id);
145 logout.startedAt = harness.now();
146 146
147 harness.advance(COMBAT_LOGOUT_MS - 10_000);
147 // Still within the hard cap from original disconnect → stay.
148 harness.advance(2_000);
148 149 for (let i = 0; i < 3; i++)
149 150 { harness.simulation.step(); }
150 151 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
152 assert.equal(logout.startedAt, startedAt);
151 153
152 clearCombatAndExpireQuiet(harness, character.character_id, playerId);
154 // Past hard cap from disconnect even with fresh activity → despawn.
155 harness.advance(COMBAT_LOGOUT_MS);
156 track.lastCombatActivityAt = harness.now();
157 // Combat-logout is checked about once per second of sim ticks.
158 for (let i = 0; i < 60; i++)
159 { harness.simulation.step(); }
153 160 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), false);
161 assert.equal(harness.simulation.isCombatLogout(character.character_id), false);
154 162 }
155 163 finally
156 164 { harness.close(); }
@@ -119,7 +119,7 @@ test("combat logout keeps the character until quiet timeout", () =>
119 { harness.close(); }
119 { harness.close(); }
120});
120});
121
121
122test("combat activity resets the combat-logout quiet timer", () =>
122test("combat activity delays quiet expiry but hard-caps from disconnect", () =>
123{
123{
124 const harness = makeSimulation({ workerCount: 1 });
124 const harness = makeSimulation({ workerCount: 1 });
125 try
125 try
@@ -133,24 +133,32 @@ test("combat activity resets the combat-logout quiet timer", () =>
133 spawnerId: null
133 spawnerId: null
134 }));
134 }));
135 engageAndLogout(harness, character, playerId, deerId);
135 engageAndLogout(harness, character, playerId, deerId);
136 const logout = harness.simulation.combatLogouts.get(character.character_id);
137 const startedAt = logout.startedAt;
136
138
139 // Fresh combat activity shortly before the quiet window would end.
137 harness.advance(COMBAT_LOGOUT_MS - 5_000);
140 harness.advance(COMBAT_LOGOUT_MS - 5_000);
138 for (let i = 0; i < 3; i++)
141 for (let i = 0; i < 3; i++)
139 { harness.simulation.step(); }
142 { harness.simulation.step(); }
140 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
143 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
141
142 const track = harness.simulation.combatTracking.get(character.character_id);
144 const track = harness.simulation.combatTracking.get(character.character_id);
143 track.lastCombatActivityAt = harness.now();
145 track.lastCombatActivityAt = harness.now();
144 const logout = harness.simulation.combatLogouts.get(character.character_id);
145 logout.startedAt = harness.now();
146
146
147 harness.advance(COMBAT_LOGOUT_MS - 10_000);
147 // Still within the hard cap from original disconnect → stay.
148 harness.advance(2_000);
148 for (let i = 0; i < 3; i++)
149 for (let i = 0; i < 3; i++)
149 { harness.simulation.step(); }
150 { harness.simulation.step(); }
150 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
151 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), true);
152 assert.equal(logout.startedAt, startedAt);
151
153
152 clearCombatAndExpireQuiet(harness, character.character_id, playerId);
154 // Past hard cap from disconnect even with fresh activity → despawn.
155 harness.advance(COMBAT_LOGOUT_MS);
156 track.lastCombatActivityAt = harness.now();
157 // Combat-logout is checked about once per second of sim ticks.
158 for (let i = 0; i < 60; i++)
159 { harness.simulation.step(); }
153 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), false);
160 assert.equal(harness.simulation.isCharacterInWorld(character.character_id), false);
161 assert.equal(harness.simulation.isCombatLogout(character.character_id), false);
154 }
162 }
155 finally
163 finally
156 { harness.close(); }
164 { harness.close(); }