Switch internal counters to new-style Element

[mudpy.git] / mudpy / data.py

diff --git a/mudpy/data.py b/mudpy/data.py
index f113369..4c85915 100644 (file)
--- a/mudpy/data.py
+++ b/mudpy/data.py
@@ -61,6 +61,8 @@ class Data:
                     if included not in includes:
                         includes.append(included)
                 continue
+            if node.startswith("_"):
+                continue
             facet_pos = node.rfind(".") + 1
             if not facet_pos:
                 mudpy.misc.Element(node, self.universe, self, old_style=True)
@@ -215,8 +217,8 @@ def find_file(
                 prefix = os.path.join(universe.startdir, prefix)
 
     # when no root path is specified, assume the current working directory
-    if not prefix:
-        prefix = os.getcwd()
+    if (not prefix or prefix == ".") and hasattr(universe, "startdir"):
+        prefix = universe.startdir
 
     # make sure it's absolute
     prefix = os.path.realpath(prefix)
@@ -273,6 +275,4 @@ def find_file(
 
     # and normalize it last thing before returning
     file_name = os.path.realpath(file_name)
-
-    # normalize the resulting file path and hand it back
     return file_name