From 857f3fd3c105a1bab57e3cad95e2df3c7797a3a5 Mon Sep 17 00:00:00 2001 From: Adrienne Walker Date: Mon, 18 Dec 2023 11:29:19 -0800 Subject: [PATCH] util: fix make_timeline support for split logs (#6049) Without this code, it only finds one fight with `-lf` --- util/logtools/encounter_tools.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/logtools/encounter_tools.ts b/util/logtools/encounter_tools.ts index c8fdee9424..8ae2463d97 100644 --- a/util/logtools/encounter_tools.ts +++ b/util/logtools/encounter_tools.ts @@ -129,11 +129,11 @@ export class EncounterFinder { const cZ = this.regex.changeZone.exec(line)?.groups; if (cZ) { - if (this.currentZone.zoneName === cZ.name) { - // Zoning into the same zone, possibly a d/c situation. - // Don't stop anything? - return; - } + // Note this could happen in the case of a d/c, + // however a log splitting scenario could only include + // the relevant change zone lines and not anything else, + // which is a much more common scenario, so don't check if + // this is the "same zone". // If we changed zones, we have definitely stopped fighting. // Therefore we can safely initialize everything.