Server, plugin: Refactor ai (plugin hooks).

[plomrogue] / server / commands.py

diff --git a/server/commands.py b/server/commands.py
index eb8cf1cedcc8f8937a5800f888d7c0740987b879..fc384528704cf88e8cfec3b975a857d1433594f2 100644 (file)
--- a/server/commands.py
+++ b/server/commands.py
@@ -87,8 +87,8 @@ def command_makeworld(seed_string):
     """Call make_world()."""
     val = integer_test(seed_string, 0, 4294967295)
     if None != val:
-        from server.config.misc import make_world_func
-        make_world_func(val)
+        from server.make_world import make_world
+        make_world(val)
 
 
 def command_maplength(maplength_string):
@@ -513,6 +513,6 @@ def play_move(str_arg):
 
 def command_ai():
     """Call ai() on player Thing, then turn_over()."""
-    from server.config.actions import ai_func
-    ai_func(world_db["Things"][0])
+    from server.ai import ai
+    ai(world_db["Things"][0])
     turn_over()