From f15e05c2477a6dd707faf76548dccb4ab9d46b87 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 8 Jan 2015 16:54:50 +0100
Subject: [PATCH] Working on bugs with getting system to go through
 initialization sanely.

---
 bin/evennia                     | 2 --
 evennia/locks/lockhandler.py    | 1 -
 evennia/server/initial_setup.py | 6 +-----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/bin/evennia b/bin/evennia
index bd79d76c6c..7b37a0f11c 100755
--- a/bin/evennia
+++ b/bin/evennia
@@ -878,8 +878,6 @@ def main():
         run_menu()
     elif mode in ('start', 'reload', 'stop'):
         # operate the server directly
-        if mode != "stop":
-            check_database(False)
         server_operation(mode, service, args.interactive, args.profiler)
     else:
         # pass-through to django manager
diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 2179383dc0..8472024cd7 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -135,7 +135,6 @@ def _cache_lockfuncs():
     global _LOCKFUNCS
     _LOCKFUNCS = {}
     for modulepath in settings.LOCK_FUNC_MODULES:
-        modulepath = utils.pypath_to_realpath(modulepath)
         mod = utils.mod_import(modulepath)
         if mod:
             for tup in (tup for tup in inspect.getmembers(mod) if callable(tup[1])):
diff --git a/evennia/server/initial_setup.py b/evennia/server/initial_setup.py
index a7f23b4838..f5fbb34889 100644
--- a/evennia/server/initial_setup.py
+++ b/evennia/server/initial_setup.py
@@ -74,8 +74,8 @@ def create_objects():
     god_character.db.desc = _('This is User #1.')
     god_character.locks.add("examine:perm(Immortals);edit:false();delete:false();boot:false();msg:all();puppet:false()")
     god_character.permissions.add("Immortals")
-
     god_character.save()
+
     god_player.attributes.add("_first_login", True)
     god_player.attributes.add("_last_puppet", god_character)
     god_player.db._playable_characters.append(god_character)
@@ -248,13 +248,9 @@ def handle_setup(last_step):
             setup_func()
         except Exception:
             if last_step + num == 2:
-                from evennia.players.models import PlayerDB
                 from evennia.objects.models import ObjectDB
-
                 for obj in ObjectDB.objects.all():
                     obj.delete()
-                for profile in PlayerDB.objects.all():
-                    profile.delete()
             elif last_step + num == 3:
                 from evennia.comms.models import ChannelDB
                 ChannelDB.objects.all().delete()