From 150a9e21aa5620201a261682e1665b7400f57597 Mon Sep 17 00:00:00 2001
From: Travis Briggs <audiodude@gmail.com>
Date: Fri, 23 Sep 2022 12:13:48 -0700
Subject: [PATCH] Fix Windows specific bugs

---
 evennia/server/evennia_launcher.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 04714d892b..5ac40d310a 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -38,7 +38,7 @@ EVENNIA_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(_
 
 import evennia  # noqa
 
-EVENNIA_LIB = os.path.join(os.path.dirname(os.path.abspath(evennia.__file__)))
+EVENNIA_LIB = os.path.join(EVENNIA_ROOT, "evennia")
 EVENNIA_SERVER = os.path.join(EVENNIA_LIB, "server")
 EVENNIA_TEMPLATE = os.path.join(EVENNIA_LIB, "game_template")
 EVENNIA_PROFILING = os.path.join(EVENNIA_SERVER, "profiling")
@@ -1227,7 +1227,7 @@ def evennia_version():
     version = "Unknown"
     try:
         version = evennia.__version__
-    except ImportError:
+    except (ImportError, AttributeError):
         # even if evennia is not found, we should not crash here.
         pass
     try: