From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 2 Mar 2015 04:55:16 +0000 (+0100)
Subject: Server/py: Slightly extend command_worldactive().
X-Git-Tag: tce~442
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/ledger2?a=commitdiff_plain;h=f1b54d65ab5807797ece8b682803d44e8eb4af41;p=plomrogue

Server/py: Slightly extend command_worldactive().
---

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 94925ed..db29795 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -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"]: