fix: don't nest location when the subcommand redirects to execute

mcbeet · Jan 16, 2024 · adcaf9c · adcaf9c
1 parent 9954bd6
commit adcaf9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/examples/basic_nested_location/src/data/demo/functions/foo.mcfunction b/examples/basic_nested_location/src/data/demo/functions/foo.mcfunction
@@ -33,3 +33,5 @@ function ~/../upthis:
 
     append function ~/thing:
         function #~/ddd
+
+execute if function ~/condition run function ~/action
diff --git a/mecha/contrib/nested_location.py b/mecha/contrib/nested_location.py
@@ -152,6 +152,8 @@ def walk_location_hierarchy(
                 if (
                     node
                     and node.parser == "minecraft:function"
+                    and (tail := self.spec.tree.get(*command.identifier.split(":")))
+                    and tail.redirect != ("execute",)
                     and isinstance(argument_node, AstResourceLocation)
                 ):
                     if argument_node is not last:

diff --git a/tests/snapshots/examples__build_basic_nested_location__0.pack.md b/tests/snapshots/examples__build_basic_nested_location__0.pack.md
@@ -21,6 +21,7 @@
 function demo:foo
 function demo:foo/thing
 function demo:thing
+execute if function demo:foo/condition run function demo:foo/action
 ```
 
 `@function demo:bar/thing`
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,5 @@ function ~/../upthis:

		append function ~/thing:
		function #~/ddd

		execute if function ~/condition run function ~/action