X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Fdata.py;fp=mudpy%2Fdata.py;h=c4848be27c1cfd42c6f38c9af4f4d5645598768c;hp=8b7e731510a8db0def01f2c81e73d0c39bc683f7;hb=275b3f156a8ceb0ec50e5651cbcb8415269c7dd4;hpb=947a707d32fe29eff85c7091b82be5c67056aecf diff --git a/mudpy/data.py b/mudpy/data.py index 8b7e731..c4848be 100644 --- a/mudpy/data.py +++ b/mudpy/data.py @@ -247,16 +247,18 @@ def find_file( "internal:storage", "").get("search_path", "") # another fallback root path, this time from the universe startdir - if not root_path and hasattr(universe, "startdir"): - root_path = universe.startdir + if hasattr(universe, "startdir"): + if not root_path: + root_path = universe.startdir + elif not os.path.isabs(root_path): + root_path = os.path.join(universe.startdir, root_path) # when no root path is specified, assume the current working directory if not root_path: root_path = os.getcwd() - # otherwise, make sure it's absolute - elif not os.path.isabs(root_path): - root_path = os.path.realpath(root_path) + # make sure it's absolute + root_path = os.path.realpath(root_path) # if there's no search path, just use the root path and etc if not search_path: