home · contact · privacy
Server/py: Slightly extend command_worldactive().
authorChristian Heller <c.heller@plomlompom.de>
Mon, 2 Mar 2015 04:55:16 +0000 (05:55 +0100)
committerChristian Heller <c.heller@plomlompom.de>
Mon, 2 Mar 2015 04:55:16 +0000 (05:55 +0100)
plomrogue-server.py

index 94925ed2bf0f4886787f35e5fd373a010050d08e..db297952c4ca3d0756bf277fee9313827edfd4f1 100755 (executable)
@@ -369,7 +369,7 @@ def command_makeworld(seed_string):
 def command_maplength(maplength_string):
     # DUMMY.
     set_world_inactive()
-    # TODO: remove map
+    # TODO: remove map (is this necessary? no memory management trouble …)
     world_db["Things"] = {}
     setter(None, "MAP_LENGTH", 1, 256)(maplength_string)
 
@@ -378,8 +378,11 @@ def command_worldactive(worldactive_string):
     # DUMMY.
     val = integer_test(worldactive_string, 0, 1)
     if val:
-        if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
-            set_world_inactive()
+        if 0 != world_db["WORLD_ACTIVE"]:
+            if 0 == val:
+                set_world_inactive()
+            else:
+                print("World already active.")
         elif 0 == world_db["WORLD_ACTIVE"]:
             wait_exists = False
             for ThingAction in world_db["ThingActions"]: