From be3237bd4421f3cc6d2eedf0fbf24d9bcd66994e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Bosc=C3=A1?= <juan_bosca@live.com>
Date: Wed, 8 Apr 2026 19:20:32 -0300
Subject: [PATCH 1/4] Improve quest parsing and mission mapping

Normalize and harden quest handling across servers: add helpers to resolve mob names and normalize (possibly reversed) quest time windows; prefer start time for certain no-mission quests in cmdQuest. Store last killed monster nameID/time to help map hunt-only updates. Rework quest mission parsing and quest_update_mission_hunt to handle various server formats (hunt_id, hunt_id_cont, mob_id), build synthetic hunt identifiers, prefer exact mission_index matches, use packet-order and recent-kill/progress-delta fallbacks for ambiguous updates, and avoid noisy duplicate progress messages by only notifying on real changes. Add debug logging for resolved time windows and ambiguous mappings.
---
 src/Commands.pm        |  12 ++-
 src/Network/Receive.pm | 183 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 171 insertions(+), 24 deletions(-)

diff --git a/src/Commands.pm b/src/Commands.pm
index 165172ef02..2cf4ef3a8f 100644
--- a/src/Commands.pm
+++ b/src/Commands.pm
@@ -7089,8 +7089,17 @@ sub cmdQuest {
 		my $msg .= center(" " . T("Quest List") . " ", 79, '-') . "\n";
 		foreach my $questID (keys %{$questList}) {
 			my $quest = $questList->{$questID};
+			my $display_time = $quest->{time_expire};
+			if ((!exists $quest->{missions} || !keys %{$quest->{missions}})
+				&& $quest->{time_start}
+				&& $quest->{time_expire}
+				&& $quest->{time_start} < $quest->{time_expire}) {
+				# For "wait/return after" quests without hunt missions, start time
+				# carries the meaningful availability timestamp on some servers.
+				$display_time = $quest->{time_start};
+			}
 			$msg .= swrite(sprintf("\@%s \@%s \@%s \@%s \@%s", ('>'x2), ('<'x5), ('<'x30), ('<'x10), ('<'x24)),
-				[$k, $questID, $quests_lut{$questID} ? $quests_lut{$questID}{title} : '', $quest->{active} ? T("active") : T("inactive"), $quest->{time_expire} ? scalar localtime $quest->{time_expire} : '']);
+				[$k, $questID, $quests_lut{$questID} ? $quests_lut{$questID}{title} : '', $quest->{active} ? T("active") : T("inactive"), $display_time ? scalar localtime $display_time : '']);
 			foreach my $mobID (sort {
 				($quest->{missions}{$a}{mission_index} // 9999) <=> ($quest->{missions}{$b}{mission_index} // 9999) || $a <=> $b
 			} keys %{$quest->{missions}}) {
@@ -8787,4 +8796,3 @@ sub cmdEden {
 }
 
 1;
-
diff --git a/src/Network/Receive.pm b/src/Network/Receive.pm
index 8a167cc457..3b84a74859 100644
--- a/src/Network/Receive.pm
+++ b/src/Network/Receive.pm
@@ -2435,6 +2435,8 @@ sub actor_died_or_disappeared {
 		} elsif ($args->{type} == 1) {
 			debug "Monster Died: " . $monster->name . " ($monster->{binID})\n", "parseMsg_damage";
 			$monster->{dead} = 1;
+			$self->{_last_killed_monster_nameID} = $monster->{nameID};
+			$self->{_last_killed_monster_time} = time;
 
 			if ((AI::action() ne "attack" || AI::args(0)->{ID} eq $ID) &&
 				($config{itemsTakeAuto_party} &&
@@ -4625,6 +4627,32 @@ sub progress_bar_stop {
 # 02b1 <packet len>.W <num>.L { <quest id>.L <active>.B }*num (ZC_ALL_QUEST_LIST)
 # 097a <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num (ZC_ALL_QUEST_LIST2)
 # 09f8 <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <hunt identification>.L <mob type>.L <mob_id>.L <min level>.W <max level>.W <killed>.W <total>.W <mob name>.24B }*count }*num  (ZC_ALL_QUEST_LIST3)
+sub _quest_resolve_mob_name {
+	my ($mob_id, $packet_name_raw) = @_;
+	my $packet_name = bytesToString($packet_name_raw // '');
+	$packet_name =~ s/\x00+$//;
+	my $has_control_chars = $packet_name =~ /[\x00-\x08\x0B\x0C\x0E-\x1F]/;
+
+	if (defined $mob_id && defined $monsters_lut{$mob_id} && ($packet_name eq '' || $has_control_chars)) {
+		return $monsters_lut{$mob_id};
+	}
+
+	return $packet_name;
+}
+
+sub _quest_normalize_time_window {
+	my ($time_start, $time_expire) = @_;
+	return ($time_start, $time_expire) if !defined $time_start || !defined $time_expire;
+	return ($time_start, $time_expire) if !$time_start || !$time_expire;
+
+	# Some servers can send start/expire reversed.
+	if ($time_start > $time_expire) {
+		return ($time_expire, $time_start);
+	}
+
+	return ($time_start, $time_expire);
+}
+
 sub quest_all_list {
 	my ( $self, $args ) = @_;
 
@@ -4688,6 +4716,13 @@ sub quest_all_list {
         my $quest;
 
         @{$quest}{@{$quest_info->{quest_keys}}} = unpack($quest_info->{quest_pack}, substr($args->{message}, $offset, $quest_info->{quest_len}));
+		if (exists $quest->{time_start} && exists $quest->{time_expire}) {
+			my $raw_time_start = $quest->{time_start};
+			my $raw_time_expire = $quest->{time_expire};
+			($quest->{time_start}, $quest->{time_expire}) = _quest_normalize_time_window($quest->{time_start}, $quest->{time_expire});
+			debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
+				$quest->{quest_id}, $raw_time_start, $raw_time_expire, $quest->{time_start}, $quest->{time_expire}), "info";
+		}
 
         %{$questList->{$quest->{quest_id}}} = %$quest;
 
@@ -4702,8 +4737,8 @@ sub quest_all_list {
         for ( my $j = 0 ; $j < $quest->{mission_amount}; $j++ ) {
             my $mission;
 
-            @{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
-			$mission->{mob_name} = bytesToString($mission->{mob_name_original});
+	            @{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
+				$mission->{mob_name} = _quest_resolve_mob_name($mission->{mob_id}, $mission->{mob_name_original});
             $mission->{mission_index} = $j;
 
             %{$questList->{$quest->{quest_id}}->{missions}->{$mission->{mob_id}}} = %$mission;
@@ -4742,6 +4777,13 @@ sub quest_all_mission {
 		my $quest;
 
 		@{$quest}{@{$quest_info->{quest_keys}}} = unpack($quest_info->{quest_pack}, substr($args->{message}, $offset, $quest_info->{quest_len}));
+		if (exists $quest->{time_start} && exists $quest->{time_expire}) {
+			my $raw_time_start = $quest->{time_start};
+			my $raw_time_expire = $quest->{time_expire};
+			($quest->{time_start}, $quest->{time_expire}) = _quest_normalize_time_window($quest->{time_start}, $quest->{time_expire});
+			debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
+				$quest->{quest_id}, $raw_time_start, $raw_time_expire, $quest->{time_start}, $quest->{time_expire}), "info";
+		}
 
 		my $char_quest = \%{$questList->{$quest->{quest_id}}};
 
@@ -4763,7 +4805,7 @@ sub quest_all_mission {
 			my $mission;
 
 			@{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
-			$mission->{mob_name} = bytesToString($mission->{mob_name_original});
+			$mission->{mob_name} = _quest_resolve_mob_name($mission->{mob_id}, $mission->{mob_name_original});
 			$mission->{mission_index} = $j;
 
 			%{$questList->{$char_quest->{quest_id}}->{missions}->{$mission->{mob_id}}} = %$mission;
@@ -4815,10 +4857,14 @@ sub quest_add {
 	}
 
 	my $quest = \%{$questList->{$args->{questID}}};
+	my ($raw_time_start, $raw_time_expire) = ($args->{time_start}, $args->{time_expire});
+	my ($time_start, $time_expire) = _quest_normalize_time_window($raw_time_start, $raw_time_expire);
+	debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
+		$args->{questID}, $raw_time_start, $raw_time_expire, $time_start, $time_expire), "info";
 	$quest->{quest_id} = $args->{questID};
 	$quest->{active} = $args->{active};
-	$quest->{time_start} = $args->{time_start};
-	$quest->{time_expire} = $args->{time_expire};
+	$quest->{time_start} = $time_start;
+	$quest->{time_expire} = $time_expire;
 	$quest->{mission_amount} = $args->{mission_amount};
 
 	if ($args->{questID}) {
@@ -4833,7 +4879,7 @@ sub quest_add {
 		my $mission;
 
 		@{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
-		$mission->{mob_name} = bytesToString($mission->{mob_name_original});
+		$mission->{mob_name} = _quest_resolve_mob_name($mission->{mob_id}, $mission->{mob_name_original});
 		$mission->{mission_index} = $j;
 
 		%{$questList->{$quest->{quest_id}}->{missions}->{$mission->{mob_id}}} = %$mission;
@@ -4886,20 +4932,59 @@ sub quest_update_mission_hunt {
 		$args->{mission_amount} = (length $args->{message}) / ($quest_info->{mission_len});
 	}
 
+	my %quest_update_seq;
+
 	for (my $i = 0; $i < $args->{mission_amount}; $i++) {
 		my $mission;
 
-		@{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
+		my $raw_mission = substr($args->{message}, $offset, $quest_info->{mission_len});
+		$offset += $quest_info->{mission_len};
+
+		@{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, $raw_mission);
 
-		next unless exists $questList->{$mission->{questID}};
+		unless (exists $questList->{$mission->{questID}}) {
+			next;
+		}
 
 		my $quest = \%{$questList->{$mission->{questID}}};
+		my $quest_packet_index = $quest_update_seq{$mission->{questID}} // 0;
+		$quest_update_seq{$mission->{questID}} = $quest_packet_index + 1;
 
 		my $mission_id;
-
+		my $update_without_mob_id = exists $mission->{hunt_id} && !exists $mission->{mob_id};
+		my $hunt_identifier = undef;
+		if (exists $mission->{hunt_id}) {
+			# Some servers send questID in this field instead of a unique hunt identifier.
+			# Treat it as a usable hunt identifier when it looks like questID * 1000 + mission_index.
+			# Accept base value (index 0): e.g. 12086000 for quest 12086 mission 0.
+			my $hunt_base = $mission->{questID} * 1000;
+			$hunt_identifier = $mission->{hunt_id}
+				if $mission->{hunt_id} >= $hunt_base && $mission->{hunt_id} < ($hunt_base + 1000);
+		}
+		if (!defined $hunt_identifier
+			&& exists $mission->{hunt_id_cont}
+			&& $mission->{hunt_id_cont} > 0) {
+			# ROla-like servers can send questID in hunt_id and mission slot in hunt_id_cont.
+			# Rebuild a synthetic hunt identifier to preserve deterministic mission_index mapping.
+			$hunt_identifier = ($mission->{questID} * 1000) + ($mission->{hunt_id_cont} - 1);
+		}
+		my $recent_kill_mission_id;
+
+		# For hunt-only updates, if we just killed a monster, that is the strongest
+		# deterministic signal to map the mission.
+		if ($update_without_mob_id
+			&& defined $self->{_last_killed_monster_nameID}
+			&& defined $self->{_last_killed_monster_time}
+			&& time - $self->{_last_killed_monster_time} <= 3) {
+			my @recent_kill_candidates = grep {
+				exists $quest->{missions}->{$_}{mob_id}
+					&& $quest->{missions}->{$_}{mob_id} == $self->{_last_killed_monster_nameID}
+			} keys %{$quest->{missions}};
+			$recent_kill_mission_id = $recent_kill_candidates[0] if @recent_kill_candidates == 1;
+		}
 		# Mission is saved as hunt_id and server sent hunt_id
-		if (exists $mission->{hunt_id} && exists $quest->{missions}->{$mission->{hunt_id}}) {
-			$mission_id = $mission->{hunt_id};
+		if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
+			$mission_id = $hunt_identifier;
 
 		# Mission is saved as mob_id and server sent mob_id
 		} elsif (exists $mission->{mob_id} && exists $quest->{missions}->{$mission->{mob_id}}) {
@@ -4916,10 +5001,10 @@ sub quest_update_mission_hunt {
 			}
 
 		# Mission is saved as mob_id and server sent hunt_id
-		} elsif (exists $mission->{hunt_id} && !exists $quest->{missions}->{$mission->{hunt_id}}) {
+		} elsif (defined $hunt_identifier && !exists $quest->{missions}->{$hunt_identifier}) {
 			# Search in the quest of a mission with this hunt_id
 			foreach my $current_key (keys %{$quest->{missions}}) {
-				if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $mission->{hunt_id}) {
+				if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $hunt_identifier) {
 					$mission_id = $quest->{missions}->{$current_key}{mob_id};
 					last;
 				}
@@ -4928,27 +5013,83 @@ sub quest_update_mission_hunt {
 
 		# Some servers can return mission updates keyed only by hunt identification.
 		# If direct lookup fails, map update by mission index from hunt_id.
-		if (!defined $mission_id && exists $mission->{hunt_id}) {
-			my $mission_index = $mission->{hunt_id} - ($mission->{questID} * 1000);
+		if (!defined $mission_id && defined $hunt_identifier) {
+			my $mission_index = $hunt_identifier - ($mission->{questID} * 1000);
+			my @exact_candidates;
+			my @legacy_candidates;
 
 			foreach my $current_key (keys %{$quest->{missions}}) {
 				next unless exists $quest->{missions}->{$current_key}{mission_index};
-				next unless $quest->{missions}->{$current_key}{mission_index} == $mission_index || $quest->{missions}->{$current_key}{mission_index} == $mission_index - 1;
-				$mission_id = $current_key;
-				last;
+				my $current_index = $quest->{missions}->{$current_key}{mission_index};
+				push @exact_candidates, $current_key if $current_index == $mission_index;
+				push @legacy_candidates, $current_key if $current_index == $mission_index - 1;
+			}
+
+			# Prefer exact mission_index match first.
+			if (@exact_candidates == 1) {
+				$mission_id = $exact_candidates[0];
+			} elsif (!@exact_candidates && @legacy_candidates == 1) {
+				# Compatibility fallback for servers that report mission_index starting at 1.
+				$mission_id = $legacy_candidates[0];
+			} elsif (@exact_candidates > 1 || @legacy_candidates > 1) {
+				debug TF("Quest mission update ignored due to ambiguous hunt mapping (quest: %d, hunt_id: %d, mission_index: %d)\n",
+					$mission->{questID}, $mission->{hunt_id}, $mission_index), "info";
+			}
+		}
+
+		# Last-resort fallback for hunt-only updates: preserve packet order within the same quest.
+		if (!defined $mission_id && $update_without_mob_id) {
+			my @index_candidates = grep {
+			exists $quest->{missions}->{$_}{mission_index}
+				&& $quest->{missions}->{$_}{mission_index} == $quest_packet_index
+			} keys %{$quest->{missions}};
+				$mission_id = $index_candidates[0] if @index_candidates == 1;
+			}
+
+		# Fallback only after deterministic mappings fail: use recent kill.
+		if (!defined $mission_id && defined $recent_kill_mission_id) {
+			$mission_id = $recent_kill_mission_id;
+		}
+
+		# Final fallback for hunt-only updates without usable identifiers:
+		# map by progress delta when there is a single plausible mission.
+		if (!defined $mission_id && $update_without_mob_id) {
+			my @progress_candidates = grep {
+				exists $quest->{missions}->{$_}{mob_count}
+					&& exists $quest->{missions}->{$_}{mob_goal}
+					&& $quest->{missions}->{$_}{mob_count} != $mission->{mob_count}
+					&& $quest->{missions}->{$_}{mob_goal} == $mission->{mob_goal}
+			} keys %{$quest->{missions}};
+
+			# Prefer increasing progress when available (party kills can arrive without local hit signal).
+			my @increasing_candidates = grep {
+				$quest->{missions}->{$_}{mob_count} < $mission->{mob_count}
+			} @progress_candidates;
+
+			if (@increasing_candidates == 1) {
+				$mission_id = $increasing_candidates[0];
+			} elsif (@progress_candidates == 1) {
+				$mission_id = $progress_candidates[0];
 			}
 		}
 
-		next unless defined $mission_id && exists $quest->{missions}->{$mission_id};
+		unless (defined $mission_id && exists $quest->{missions}->{$mission_id}) {
+			next;
+		}
 
 		my $quest_mission = \%{$quest->{missions}->{$mission_id}};
+		my $old_count = $quest_mission->{mob_count};
+		my $old_goal = $quest_mission->{mob_goal};
 
 		$quest_mission->{mob_count} = $mission->{mob_count};
 		$quest_mission->{mob_goal} = $mission->{mob_goal};
+		my $mission_changed = !defined $old_count || !defined $old_goal
+			|| $old_count != $quest_mission->{mob_count}
+			|| $old_goal != $quest_mission->{mob_goal};
 
 		debug "- MobID: $mission->{mob_id} - Name: $mission->{mob_name} - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
 
-		if ($config{questDisplayStyle}) {
+		if ($config{questDisplayStyle} && $mission_changed) {
 			if ($config{questDisplayStyle} >= 2) {
 				warning TF("[%s] Quest - defeated [%s] progress (%s/%s)\n", $quests_lut{$mission->{questID}} ? "$quests_lut{$mission->{questID}}{title} ($mission->{questID})" : $mission->{questID}, $quest_mission->{mob_name}, $quest_mission->{mob_count}, $quest_mission->{mob_goal}), "info";
 			} else {
@@ -4956,8 +5097,6 @@ sub quest_update_mission_hunt {
 			}
 		}
 
-		$offset += $quest_info->{mission_len};
-
 		Plugins::callHook('quest_mission_updated', {
 			questID => $quest_mission->{questID},
 			mission_id => $mission_id,

From 13cd133a832297070a3fe9a6232302eab959a879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Bosc=C3=A1?= <juan_bosca@live.com>
Date: Wed, 8 Apr 2026 20:04:30 -0300
Subject: [PATCH 2/4] Improve quest parsing and mission mapping

Normalize and robustly handle quest data from server packets. Add helpers to normalize swapped start/expire times and to resolve mob names (falling back to monsters_lut when packet names are empty or contain control chars). Use quest start time as display_time for wait/return quests without missions. Track last killed monster nameID/time to aid mapping of hunt-only updates. Rework quest_update_mission_hunt to derive a stable hunt identifier (including hunt_id_cont), maintain per-quest packet sequence, and attempt multiple deterministic fallbacks (direct hunt/mob lookup, exact/legacy mission_index, packet-order, recent kill, and progress-delta) while skipping ambiguous updates. Suppress display/logging when mission progress didn't actually change.
---
 src/Network/Receive.pm | 52 +++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/Network/Receive.pm b/src/Network/Receive.pm
index 3b84a74859..cc982776cc 100644
--- a/src/Network/Receive.pm
+++ b/src/Network/Receive.pm
@@ -4713,39 +4713,35 @@ sub quest_all_list {
 	}
 
 	for (my $i = 0 ; $i < $args->{quest_amount} ; $i++) {
-        my $quest;
+		my $quest;
 
-        @{$quest}{@{$quest_info->{quest_keys}}} = unpack($quest_info->{quest_pack}, substr($args->{message}, $offset, $quest_info->{quest_len}));
+		@{$quest}{@{$quest_info->{quest_keys}}} = unpack($quest_info->{quest_pack}, substr($args->{message}, $offset, $quest_info->{quest_len}));
 		if (exists $quest->{time_start} && exists $quest->{time_expire}) {
-			my $raw_time_start = $quest->{time_start};
-			my $raw_time_expire = $quest->{time_expire};
 			($quest->{time_start}, $quest->{time_expire}) = _quest_normalize_time_window($quest->{time_start}, $quest->{time_expire});
-			debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
-				$quest->{quest_id}, $raw_time_start, $raw_time_expire, $quest->{time_start}, $quest->{time_expire}), "info";
 		}
 
-        %{$questList->{$quest->{quest_id}}} = %$quest;
+		%{$questList->{$quest->{quest_id}}} = %$quest;
 
-        debug "Quest ID: $quest->{quest_id} - active: $quest->{active}\n", "info";
+		debug "Quest ID: $quest->{quest_id} - active: $quest->{active}\n", "info";
 
-        $offset += $quest_info->{quest_len};
+		$offset += $quest_info->{quest_len};
 
-        next if !exists $quest->{mission_amount};
+		next if !exists $quest->{mission_amount};
 
-        debug "- Mission amount: $quest->{mission_amount}\n", "info";
+		debug "- Mission amount: $quest->{mission_amount}\n", "info";
 
-        for ( my $j = 0 ; $j < $quest->{mission_amount}; $j++ ) {
-            my $mission;
+		for ( my $j = 0 ; $j < $quest->{mission_amount}; $j++ ) {
+			my $mission;
 
-	            @{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
-				$mission->{mob_name} = _quest_resolve_mob_name($mission->{mob_id}, $mission->{mob_name_original});
-            $mission->{mission_index} = $j;
+			@{$mission}{@{$quest_info->{mission_keys}}} = unpack($quest_info->{mission_pack}, substr($args->{message}, $offset, $quest_info->{mission_len}));
+			$mission->{mob_name} = _quest_resolve_mob_name($mission->{mob_id}, $mission->{mob_name_original});
+			$mission->{mission_index} = $j;
 
-            %{$questList->{$quest->{quest_id}}->{missions}->{$mission->{mob_id}}} = %$mission;
+			%{$questList->{$quest->{quest_id}}->{missions}->{$mission->{mob_id}}} = %$mission;
 
-            debug "- MobID: $mission->{mob_id} - Name: $mission->{mob_name} - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
+			debug "- MobID: $mission->{mob_id} - Name: $mission->{mob_name} - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
 
-            $offset += $quest_info->{mission_len};
+			$offset += $quest_info->{mission_len};
 
 			Plugins::callHook('quest_mission_added', {
 				questID => $quest->{quest_id},
@@ -4778,11 +4774,7 @@ sub quest_all_mission {
 
 		@{$quest}{@{$quest_info->{quest_keys}}} = unpack($quest_info->{quest_pack}, substr($args->{message}, $offset, $quest_info->{quest_len}));
 		if (exists $quest->{time_start} && exists $quest->{time_expire}) {
-			my $raw_time_start = $quest->{time_start};
-			my $raw_time_expire = $quest->{time_expire};
 			($quest->{time_start}, $quest->{time_expire}) = _quest_normalize_time_window($quest->{time_start}, $quest->{time_expire});
-			debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
-				$quest->{quest_id}, $raw_time_start, $raw_time_expire, $quest->{time_start}, $quest->{time_expire}), "info";
 		}
 
 		my $char_quest = \%{$questList->{$quest->{quest_id}}};
@@ -4857,10 +4849,7 @@ sub quest_add {
 	}
 
 	my $quest = \%{$questList->{$args->{questID}}};
-	my ($raw_time_start, $raw_time_expire) = ($args->{time_start}, $args->{time_expire});
-	my ($time_start, $time_expire) = _quest_normalize_time_window($raw_time_start, $raw_time_expire);
-	debug TF("Quest %d time window parsed: raw(start=%s expire=%s) resolved(start=%s expire=%s)\n",
-		$args->{questID}, $raw_time_start, $raw_time_expire, $time_start, $time_expire), "info";
+	my ($time_start, $time_expire) = _quest_normalize_time_window($args->{time_start}, $args->{time_expire});
 	$quest->{quest_id} = $args->{questID};
 	$quest->{active} = $args->{active};
 	$quest->{time_start} = $time_start;
@@ -4982,6 +4971,7 @@ sub quest_update_mission_hunt {
 			} keys %{$quest->{missions}};
 			$recent_kill_mission_id = $recent_kill_candidates[0] if @recent_kill_candidates == 1;
 		}
+
 		# Mission is saved as hunt_id and server sent hunt_id
 		if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
 			$mission_id = $hunt_identifier;
@@ -5040,11 +5030,11 @@ sub quest_update_mission_hunt {
 		# Last-resort fallback for hunt-only updates: preserve packet order within the same quest.
 		if (!defined $mission_id && $update_without_mob_id) {
 			my @index_candidates = grep {
-			exists $quest->{missions}->{$_}{mission_index}
-				&& $quest->{missions}->{$_}{mission_index} == $quest_packet_index
+				exists $quest->{missions}->{$_}{mission_index}
+					&& $quest->{missions}->{$_}{mission_index} == $quest_packet_index
 			} keys %{$quest->{missions}};
-				$mission_id = $index_candidates[0] if @index_candidates == 1;
-			}
+			$mission_id = $index_candidates[0] if @index_candidates == 1;
+		}
 
 		# Fallback only after deterministic mappings fail: use recent kill.
 		if (!defined $mission_id && defined $recent_kill_mission_id) {

From e2d699546990406ce7bd990b59c8cfc03ab59185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Bosc=C3=A1?= <juan_bosca@live.com>
Date: Thu, 9 Apr 2026 01:27:36 -0300
Subject: [PATCH 3/4] Improve quest mission mapping and add tests

Refactor quest_update_mission_hunt to tighten conditional blocks, improve deterministic mapping, and add a recent-kill fallback lifecycle. Introduces a $used_recent_kill_fallback flag so the last-killed-monster signal is consumed and cleared only when actually used, and enhances debug output to show the resolved mob id/name and detailed unresolved mapping info. Also normalizes indentation/brace placement to reduce accidental logic errors. Adds new QuestReceiveTest with cases for hunt_id_cont mapping, recent-kill fallback consumption, and unresolved update logging, and registers it in test/unittests.pl.
---
 src/Network/Receive.pm       |  85 +++++++++++++++++-----------
 src/test/QuestReceiveTest.pm | 106 +++++++++++++++++++++++++++++++++++
 src/test/unittests.pl        |   1 +
 3 files changed, 159 insertions(+), 33 deletions(-)
 create mode 100644 src/test/QuestReceiveTest.pm

diff --git a/src/Network/Receive.pm b/src/Network/Receive.pm
index cc982776cc..da39f66bbe 100644
--- a/src/Network/Receive.pm
+++ b/src/Network/Receive.pm
@@ -4939,7 +4939,7 @@ sub quest_update_mission_hunt {
 		my $quest_packet_index = $quest_update_seq{$mission->{questID}} // 0;
 		$quest_update_seq{$mission->{questID}} = $quest_packet_index + 1;
 
-		my $mission_id;
+			my $mission_id;
 		my $update_without_mob_id = exists $mission->{hunt_id} && !exists $mission->{mob_id};
 		my $hunt_identifier = undef;
 		if (exists $mission->{hunt_id}) {
@@ -4958,6 +4958,7 @@ sub quest_update_mission_hunt {
 			$hunt_identifier = ($mission->{questID} * 1000) + ($mission->{hunt_id_cont} - 1);
 		}
 		my $recent_kill_mission_id;
+		my $used_recent_kill_fallback = 0;
 
 		# For hunt-only updates, if we just killed a monster, that is the strongest
 		# deterministic signal to map the mission.
@@ -4973,37 +4974,37 @@ sub quest_update_mission_hunt {
 		}
 
 		# Mission is saved as hunt_id and server sent hunt_id
-		if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
-			$mission_id = $hunt_identifier;
+			if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
+				$mission_id = $hunt_identifier;
 
 		# Mission is saved as mob_id and server sent mob_id
-		} elsif (exists $mission->{mob_id} && exists $quest->{missions}->{$mission->{mob_id}}) {
-			$mission_id = $mission->{mob_id};
+			} elsif (exists $mission->{mob_id} && exists $quest->{missions}->{$mission->{mob_id}}) {
+				$mission_id = $mission->{mob_id};
 
 		# Mission is saved as hunt_id and server sent mob_id
 		} elsif (exists $mission->{mob_id} && !exists $quest->{missions}->{$mission->{mob_id}}) {
 			# Search in the quest of a mission with this mob_id
 			foreach my $current_key (keys %{$quest->{missions}}) {
-				if (exists $quest->{missions}->{$current_key}{mob_id} && $quest->{missions}->{$current_key}{mob_id} == $mission->{mob_id}) {
-					$mission_id = $quest->{missions}->{$current_key}{hunt_id};
-					last;
+					if (exists $quest->{missions}->{$current_key}{mob_id} && $quest->{missions}->{$current_key}{mob_id} == $mission->{mob_id}) {
+						$mission_id = $quest->{missions}->{$current_key}{hunt_id};
+						last;
+					}
 				}
-			}
 
 		# Mission is saved as mob_id and server sent hunt_id
 		} elsif (defined $hunt_identifier && !exists $quest->{missions}->{$hunt_identifier}) {
 			# Search in the quest of a mission with this hunt_id
 			foreach my $current_key (keys %{$quest->{missions}}) {
-				if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $hunt_identifier) {
-					$mission_id = $quest->{missions}->{$current_key}{mob_id};
-					last;
+					if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $hunt_identifier) {
+						$mission_id = $quest->{missions}->{$current_key}{mob_id};
+						last;
+					}
 				}
-			}
 		}
 
 		# Some servers can return mission updates keyed only by hunt identification.
 		# If direct lookup fails, map update by mission index from hunt_id.
-		if (!defined $mission_id && defined $hunt_identifier) {
+			if (!defined $mission_id && defined $hunt_identifier) {
 			my $mission_index = $hunt_identifier - ($mission->{questID} * 1000);
 			my @exact_candidates;
 			my @legacy_candidates;
@@ -5016,30 +5017,31 @@ sub quest_update_mission_hunt {
 			}
 
 			# Prefer exact mission_index match first.
-			if (@exact_candidates == 1) {
-				$mission_id = $exact_candidates[0];
-			} elsif (!@exact_candidates && @legacy_candidates == 1) {
-				# Compatibility fallback for servers that report mission_index starting at 1.
-				$mission_id = $legacy_candidates[0];
-			} elsif (@exact_candidates > 1 || @legacy_candidates > 1) {
+				if (@exact_candidates == 1) {
+					$mission_id = $exact_candidates[0];
+				} elsif (!@exact_candidates && @legacy_candidates == 1) {
+					# Compatibility fallback for servers that report mission_index starting at 1.
+					$mission_id = $legacy_candidates[0];
+				} elsif (@exact_candidates > 1 || @legacy_candidates > 1) {
 				debug TF("Quest mission update ignored due to ambiguous hunt mapping (quest: %d, hunt_id: %d, mission_index: %d)\n",
 					$mission->{questID}, $mission->{hunt_id}, $mission_index), "info";
 			}
 		}
 
 		# Last-resort fallback for hunt-only updates: preserve packet order within the same quest.
-		if (!defined $mission_id && $update_without_mob_id) {
+			if (!defined $mission_id && $update_without_mob_id) {
 			my @index_candidates = grep {
 				exists $quest->{missions}->{$_}{mission_index}
 					&& $quest->{missions}->{$_}{mission_index} == $quest_packet_index
 			} keys %{$quest->{missions}};
-			$mission_id = $index_candidates[0] if @index_candidates == 1;
-		}
+				$mission_id = $index_candidates[0] if @index_candidates == 1;
+			}
 
 		# Fallback only after deterministic mappings fail: use recent kill.
-		if (!defined $mission_id && defined $recent_kill_mission_id) {
-			$mission_id = $recent_kill_mission_id;
-		}
+			if (!defined $mission_id && defined $recent_kill_mission_id) {
+				$mission_id = $recent_kill_mission_id;
+				$used_recent_kill_fallback = 1;
+			}
 
 		# Final fallback for hunt-only updates without usable identifiers:
 		# map by progress delta when there is a single plausible mission.
@@ -5056,18 +5058,27 @@ sub quest_update_mission_hunt {
 				$quest->{missions}->{$_}{mob_count} < $mission->{mob_count}
 			} @progress_candidates;
 
-			if (@increasing_candidates == 1) {
-				$mission_id = $increasing_candidates[0];
-			} elsif (@progress_candidates == 1) {
-				$mission_id = $progress_candidates[0];
+				if (@increasing_candidates == 1) {
+					$mission_id = $increasing_candidates[0];
+				} elsif (@progress_candidates == 1) {
+					$mission_id = $progress_candidates[0];
+				}
 			}
-		}
 
 		unless (defined $mission_id && exists $quest->{missions}->{$mission_id}) {
+			debug TF("Quest mission update unresolved (switch: %s, quest: %s, hunt_id: %s, hunt_id_cont: %s, mob_id: %s, count: %s/%s, packet_index: %s)\n",
+				$args->{switch},
+				(defined $mission->{questID} ? $mission->{questID} : 'undef'),
+				(defined $mission->{hunt_id} ? $mission->{hunt_id} : 'undef'),
+				(defined $mission->{hunt_id_cont} ? $mission->{hunt_id_cont} : 'undef'),
+				(defined $mission->{mob_id} ? $mission->{mob_id} : 'undef'),
+				(defined $mission->{mob_count} ? $mission->{mob_count} : 'undef'),
+				(defined $mission->{mob_goal} ? $mission->{mob_goal} : 'undef'),
+				$quest_packet_index), "info";
 			next;
 		}
 
-		my $quest_mission = \%{$quest->{missions}->{$mission_id}};
+			my $quest_mission = \%{$quest->{missions}->{$mission_id}};
 		my $old_count = $quest_mission->{mob_count};
 		my $old_goal = $quest_mission->{mob_goal};
 
@@ -5076,8 +5087,16 @@ sub quest_update_mission_hunt {
 		my $mission_changed = !defined $old_count || !defined $old_goal
 			|| $old_count != $quest_mission->{mob_count}
 			|| $old_goal != $quest_mission->{mob_goal};
+		if ($used_recent_kill_fallback) {
+			delete $self->{_last_killed_monster_nameID};
+			delete $self->{_last_killed_monster_time};
+		}
 
-		debug "- MobID: $mission->{mob_id} - Name: $mission->{mob_name} - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
+			my $debug_mob_id = defined $mission->{mob_id} ? $mission->{mob_id} : $quest_mission->{mob_id};
+			my $debug_mob_name = (defined $mission->{mob_name} && $mission->{mob_name} ne '')
+				? $mission->{mob_name}
+				: $quest_mission->{mob_name};
+			debug "- MobID: $debug_mob_id - Name: $debug_mob_name - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
 
 		if ($config{questDisplayStyle} && $mission_changed) {
 			if ($config{questDisplayStyle} >= 2) {
diff --git a/src/test/QuestReceiveTest.pm b/src/test/QuestReceiveTest.pm
new file mode 100644
index 0000000000..bbe5f1fc30
--- /dev/null
+++ b/src/test/QuestReceiveTest.pm
@@ -0,0 +1,106 @@
+package QuestReceiveTest;
+
+use strict;
+use Test::More;
+use Network::Receive;
+use Globals;
+
+sub start {
+	print "### Starting QuestReceiveTest\n";
+
+	my $receiver = Network::Receive->create(undef, 0);
+	ok($receiver, 'create receive instance');
+
+	subtest '0AFE maps mission using hunt_id_cont synthetic identifier' => sub {
+		$questList = {
+			500 => {
+				quest_id => 500,
+				missions => {
+					100 => { questID => 500, mob_id => 100, mission_index => 0, mob_goal => 10, mob_count => 0 },
+					200 => { questID => 500, mob_id => 200, mission_index => 1, mob_goal => 10, mob_count => 0 },
+				},
+			},
+		};
+
+		$receiver->quest_update_mission_hunt({
+			switch => '0AFE',
+			mission_amount => 1,
+			message => pack('V3 v2', 500, 500, 2, 10, 3),
+		});
+
+		is($questList->{500}{missions}{100}{mob_count}, 0, 'first mission unchanged');
+		is($questList->{500}{missions}{200}{mob_count}, 3, 'second mission updated from hunt_id_cont');
+		done_testing();
+	};
+
+	subtest 'recent kill fallback is consumed after one successful mapping' => sub {
+		$questList = {
+			600 => {
+				quest_id => 600,
+				missions => {
+					300 => { questID => 600, mob_id => 300, mob_goal => 5, mob_count => 0 },
+					301 => { questID => 600, mob_id => 301, mob_goal => 5, mob_count => 0 },
+				},
+			},
+		};
+
+		$receiver->{_last_killed_monster_nameID} = 300;
+		$receiver->{_last_killed_monster_time} = time;
+
+		my @debug_log;
+		local *Network::Receive::debug = sub {
+			push @debug_log, $_[0];
+		};
+
+		$receiver->quest_update_mission_hunt({
+			switch => '09FA',
+			mission_amount => 1,
+			message => pack('V2 v2', 600, 600, 5, 1),
+		});
+		is($questList->{600}{missions}{300}{mob_count}, 1, 'first ambiguous packet used recent kill fallback');
+		ok((grep { index($_, 'MobID: 300') >= 0 } @debug_log), 'debug line uses resolved mob_id');
+
+		$receiver->quest_update_mission_hunt({
+			switch => '09FA',
+			mission_amount => 1,
+			message => pack('V2 v2', 600, 600, 5, 2),
+		});
+
+		is($questList->{600}{missions}{300}{mob_count}, 1, 'recent kill signal was consumed after use');
+		is($questList->{600}{missions}{301}{mob_count}, 0, 'second mission still unchanged');
+		done_testing();
+	};
+
+	subtest 'logs unresolved update when no mapping can be determined' => sub {
+		$questList = {
+			700 => {
+				quest_id => 700,
+				missions => {
+					400 => { questID => 700, mob_id => 400, mob_goal => 9, mob_count => 0 },
+					401 => { questID => 700, mob_id => 401, mob_goal => 9, mob_count => 0 },
+				},
+			},
+		};
+
+		delete $receiver->{_last_killed_monster_nameID};
+		delete $receiver->{_last_killed_monster_time};
+
+		my @debug_log;
+		local *Network::Receive::debug = sub {
+			push @debug_log, $_[0];
+		};
+
+		$receiver->quest_update_mission_hunt({
+			switch => '09FA',
+			mission_amount => 1,
+			message => pack('V2 v2', 700, 700, 9, 1),
+		});
+
+		is($questList->{700}{missions}{400}{mob_count}, 0, 'first mission unchanged after unresolved packet');
+		is($questList->{700}{missions}{401}{mob_count}, 0, 'second mission unchanged after unresolved packet');
+		ok((grep { index($_, 'Quest mission update unresolved') >= 0 } @debug_log), 'unresolved mapping log emitted');
+		done_testing();
+	};
+}
+
+1;
diff --git a/src/test/unittests.pl b/src/test/unittests.pl
index eac8be27dc..569872cac1 100755
--- a/src/test/unittests.pl
+++ b/src/test/unittests.pl
@@ -23,6 +23,7 @@
 	FileParsersTest
 	DynamicPortalGroupsTest
 	NetworkTest
+	QuestReceiveTest
 	FieldTest
 	XConfTest
 );

From a5c5e46d01dcf75ce53bdaa04532bc8e2aa5f709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Bosc=C3=A1?= <juan_bosca@live.com>
Date: Thu, 9 Apr 2026 01:34:06 -0300
Subject: [PATCH 4/4] index fix

---
 src/Network/Receive.pm | 76 +++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/Network/Receive.pm b/src/Network/Receive.pm
index da39f66bbe..e36742500b 100644
--- a/src/Network/Receive.pm
+++ b/src/Network/Receive.pm
@@ -4939,7 +4939,7 @@ sub quest_update_mission_hunt {
 		my $quest_packet_index = $quest_update_seq{$mission->{questID}} // 0;
 		$quest_update_seq{$mission->{questID}} = $quest_packet_index + 1;
 
-			my $mission_id;
+		my $mission_id;
 		my $update_without_mob_id = exists $mission->{hunt_id} && !exists $mission->{mob_id};
 		my $hunt_identifier = undef;
 		if (exists $mission->{hunt_id}) {
@@ -4974,37 +4974,37 @@ sub quest_update_mission_hunt {
 		}
 
 		# Mission is saved as hunt_id and server sent hunt_id
-			if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
-				$mission_id = $hunt_identifier;
+		if (defined $hunt_identifier && exists $quest->{missions}->{$hunt_identifier}) {
+			$mission_id = $hunt_identifier;
 
 		# Mission is saved as mob_id and server sent mob_id
-			} elsif (exists $mission->{mob_id} && exists $quest->{missions}->{$mission->{mob_id}}) {
-				$mission_id = $mission->{mob_id};
+		} elsif (exists $mission->{mob_id} && exists $quest->{missions}->{$mission->{mob_id}}) {
+			$mission_id = $mission->{mob_id};
 
 		# Mission is saved as hunt_id and server sent mob_id
 		} elsif (exists $mission->{mob_id} && !exists $quest->{missions}->{$mission->{mob_id}}) {
 			# Search in the quest of a mission with this mob_id
 			foreach my $current_key (keys %{$quest->{missions}}) {
-					if (exists $quest->{missions}->{$current_key}{mob_id} && $quest->{missions}->{$current_key}{mob_id} == $mission->{mob_id}) {
-						$mission_id = $quest->{missions}->{$current_key}{hunt_id};
-						last;
-					}
+				if (exists $quest->{missions}->{$current_key}{mob_id} && $quest->{missions}->{$current_key}{mob_id} == $mission->{mob_id}) {
+					$mission_id = $quest->{missions}->{$current_key}{hunt_id};
+					last;
 				}
+			}
 
 		# Mission is saved as mob_id and server sent hunt_id
 		} elsif (defined $hunt_identifier && !exists $quest->{missions}->{$hunt_identifier}) {
 			# Search in the quest of a mission with this hunt_id
 			foreach my $current_key (keys %{$quest->{missions}}) {
-					if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $hunt_identifier) {
-						$mission_id = $quest->{missions}->{$current_key}{mob_id};
-						last;
-					}
+				if (exists $quest->{missions}->{$current_key}{hunt_id} && $quest->{missions}->{$current_key}{hunt_id} == $hunt_identifier) {
+					$mission_id = $quest->{missions}->{$current_key}{mob_id};
+					last;
 				}
+			}
 		}
 
 		# Some servers can return mission updates keyed only by hunt identification.
 		# If direct lookup fails, map update by mission index from hunt_id.
-			if (!defined $mission_id && defined $hunt_identifier) {
+		if (!defined $mission_id && defined $hunt_identifier) {
 			my $mission_index = $hunt_identifier - ($mission->{questID} * 1000);
 			my @exact_candidates;
 			my @legacy_candidates;
@@ -5017,31 +5017,31 @@ sub quest_update_mission_hunt {
 			}
 
 			# Prefer exact mission_index match first.
-				if (@exact_candidates == 1) {
-					$mission_id = $exact_candidates[0];
-				} elsif (!@exact_candidates && @legacy_candidates == 1) {
-					# Compatibility fallback for servers that report mission_index starting at 1.
-					$mission_id = $legacy_candidates[0];
-				} elsif (@exact_candidates > 1 || @legacy_candidates > 1) {
+			if (@exact_candidates == 1) {
+				$mission_id = $exact_candidates[0];
+			} elsif (!@exact_candidates && @legacy_candidates == 1) {
+				# Compatibility fallback for servers that report mission_index starting at 1.
+				$mission_id = $legacy_candidates[0];
+			} elsif (@exact_candidates > 1 || @legacy_candidates > 1) {
 				debug TF("Quest mission update ignored due to ambiguous hunt mapping (quest: %d, hunt_id: %d, mission_index: %d)\n",
 					$mission->{questID}, $mission->{hunt_id}, $mission_index), "info";
 			}
 		}
 
 		# Last-resort fallback for hunt-only updates: preserve packet order within the same quest.
-			if (!defined $mission_id && $update_without_mob_id) {
+		if (!defined $mission_id && $update_without_mob_id) {
 			my @index_candidates = grep {
 				exists $quest->{missions}->{$_}{mission_index}
 					&& $quest->{missions}->{$_}{mission_index} == $quest_packet_index
 			} keys %{$quest->{missions}};
-				$mission_id = $index_candidates[0] if @index_candidates == 1;
-			}
+			$mission_id = $index_candidates[0] if @index_candidates == 1;
+		}
 
 		# Fallback only after deterministic mappings fail: use recent kill.
-			if (!defined $mission_id && defined $recent_kill_mission_id) {
-				$mission_id = $recent_kill_mission_id;
-				$used_recent_kill_fallback = 1;
-			}
+		if (!defined $mission_id && defined $recent_kill_mission_id) {
+			$mission_id = $recent_kill_mission_id;
+			$used_recent_kill_fallback = 1;
+		}
 
 		# Final fallback for hunt-only updates without usable identifiers:
 		# map by progress delta when there is a single plausible mission.
@@ -5058,12 +5058,12 @@ sub quest_update_mission_hunt {
 				$quest->{missions}->{$_}{mob_count} < $mission->{mob_count}
 			} @progress_candidates;
 
-				if (@increasing_candidates == 1) {
-					$mission_id = $increasing_candidates[0];
-				} elsif (@progress_candidates == 1) {
-					$mission_id = $progress_candidates[0];
-				}
+			if (@increasing_candidates == 1) {
+				$mission_id = $increasing_candidates[0];
+			} elsif (@progress_candidates == 1) {
+				$mission_id = $progress_candidates[0];
 			}
+		}
 
 		unless (defined $mission_id && exists $quest->{missions}->{$mission_id}) {
 			debug TF("Quest mission update unresolved (switch: %s, quest: %s, hunt_id: %s, hunt_id_cont: %s, mob_id: %s, count: %s/%s, packet_index: %s)\n",
@@ -5078,7 +5078,7 @@ sub quest_update_mission_hunt {
 			next;
 		}
 
-			my $quest_mission = \%{$quest->{missions}->{$mission_id}};
+		my $quest_mission = \%{$quest->{missions}->{$mission_id}};
 		my $old_count = $quest_mission->{mob_count};
 		my $old_goal = $quest_mission->{mob_goal};
 
@@ -5092,11 +5092,11 @@ sub quest_update_mission_hunt {
 			delete $self->{_last_killed_monster_time};
 		}
 
-			my $debug_mob_id = defined $mission->{mob_id} ? $mission->{mob_id} : $quest_mission->{mob_id};
-			my $debug_mob_name = (defined $mission->{mob_name} && $mission->{mob_name} ne '')
-				? $mission->{mob_name}
-				: $quest_mission->{mob_name};
-			debug "- MobID: $debug_mob_id - Name: $debug_mob_name - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
+		my $debug_mob_id = defined $mission->{mob_id} ? $mission->{mob_id} : $quest_mission->{mob_id};
+		my $debug_mob_name = (defined $mission->{mob_name} && $mission->{mob_name} ne '')
+			? $mission->{mob_name}
+			: $quest_mission->{mob_name};
+		debug "- MobID: $debug_mob_id - Name: $debug_mob_name - Count: $mission->{mob_count} - Goal: $mission->{mob_goal}\n", "info";
 
 		if ($config{questDisplayStyle} && $mission_changed) {
 			if ($config{questDisplayStyle} >= 2) {