From ad0af18f5173c9085cd4850d354bb82c689c3097 Mon Sep 17 00:00:00 2001 From: Ishigh1 Date: Tue, 2 Jun 2026 09:10:43 +0200 Subject: [PATCH] Rule Builder: Resolve empty and() to True_() instead of False_()(#6239) --- rule_builder/rules.py | 2 +- test/general/test_rule_builder.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rule_builder/rules.py b/rule_builder/rules.py index d940eeb386..a156848ad6 100644 --- a/rule_builder/rules.py +++ b/rule_builder/rules.py @@ -593,7 +593,7 @@ class And(NestedRule[TWorld], game="Archipelago"): clauses.append(child) if not clauses and not items: - return true_rule or False_().resolve(world) + return true_rule or True_().resolve(world) if len(items) == 1: item, count = next(iter(items.items())) diff --git a/test/general/test_rule_builder.py b/test/general/test_rule_builder.py index 191ba3cba7..e78d62ad40 100644 --- a/test/general/test_rule_builder.py +++ b/test/general/test_rule_builder.py @@ -159,6 +159,14 @@ class CachedRuleBuilderTestCase(RuleBuilderTestCase): @classvar_matrix( rules=( + ( + And(), + True_.Resolved(player=1) + ), + ( + Or(), + False_.Resolved(player=1) + ), ( And(Has("A", 1), Has("A", 2)), Has.Resolved("A", 2, player=1),