Added a few rechecks standby clears

OpenKore · Jan 10, 2025 · 82c4900 · 82c4900
1 parent a35cc1e
commit 82c4900
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/plugins/eventMacro/eventMacro/Condition/Base/ActorNotNear.pm b/plugins/eventMacro/eventMacro/Condition/Base/ActorNotNear.pm
@@ -70,6 +70,7 @@ sub validate_condition {
 
 	} elsif ($callback_type eq 'recheck') {
 		$self->recheck_all_actor_names;
+		$self->{is_on_stand_by} = 0;
 	}
 
 	return $self->SUPER::validate_condition( ( (defined $self->{not_fulfilled_actor} || $self->{is_on_stand_by} == 1) ? 0 : 1 ) );

diff --git a/plugins/eventMacro/eventMacro/Condition/CharCurrentWeight.pm b/plugins/eventMacro/eventMacro/Condition/CharCurrentWeight.pm
@@ -35,6 +35,10 @@ sub validate_condition {
 		$self->{is_on_stand_by} = 0;
 	}
 
+	if ($callback_type eq 'recheck') {
+		$self->{is_on_stand_by} = 0;
+	}
+
 	if ($callback_type eq 'variable') {
 		$self->update_validator_var($callback_name, $args);
 	}

diff --git a/plugins/eventMacro/eventMacro/Condition/CharMaxWeight.pm b/plugins/eventMacro/eventMacro/Condition/CharMaxWeight.pm
@@ -34,6 +34,10 @@ sub validate_condition {
 	if ($callback_type eq 'variable') {
 		$self->update_validator_var($callback_name, $args);
 	}
+
+	if ($callback_type eq 'recheck') {
+		$self->{is_on_stand_by} = 0;
+	}
 
 	if ($self->{is_on_stand_by} == 1) {
 		return $self->SUPER::validate_condition(0);

diff --git a/plugins/eventMacro/eventMacro/Condition/IsInMapAndCoordinate.pm b/plugins/eventMacro/eventMacro/Condition/IsInMapAndCoordinate.pm
@@ -191,9 +191,10 @@ sub validate_condition {
 		}
 
 	} elsif ($callback_type eq 'recheck') {
+		$self->{is_on_stand_by} = 0;
 		$self->check_location;
-
 	}
+
 	return $self->SUPER::validate_condition( (defined $self->{fulfilled_coordinate} ? 1 : 0) );
 }