Server, plugin: Refactor ai (plugin hooks).

[plomrogue] / server / io.py

diff --git a/server/io.py b/server/io.py
index 0357b2e6c5946770cbcdda7f3df14e485573d044..a79e548cf4f359c1931ff20e11364797ab0b0d0e 100644 (file)
--- a/server/io.py
+++ b/server/io.py
@@ -179,9 +179,12 @@ def save_world():
         return string
 
     string = ""
+    for plugin in world_db["PLUGIN"]:
+        string = string + "PLUGIN " + plugin + "\n"
     for key in sorted(world_db.keys()):
-        if (not isinstance(world_db[key], dict)) and key != "MAP" and \
-           key != "WORLD_ACTIVE":
+        if (not isinstance(world_db[key], dict) and
+            not isinstance(world_db[key], list)) and key != "MAP" and \
+           key != "WORLD_ACTIVE" and key[0].isupper():
             string = string + key + " " + str(world_db[key]) + "\n"
     string = string + mapsetter("MAP")()
     string = string + helper("ThingActions", "TA_ID")
@@ -257,7 +260,7 @@ def obey(command, prefix, replay=False, do_record=False):
                     io_db["save_wait"] = time.time()
             io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"]
     elif 0 != len(tokens):
-        print("Invalid command/argument, or bad number of tokens.")
+        print("Invalid command/argument, or bad number of tokens: " + command)
 
 
 def obey_lines_in_file(path, name, do_record=False):