Server/py: Stricter command token counting.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index d5745edb20046f9ae4276c8c2d20f8ece96b3f6a..c28f4def769ed6b6518009c6d9c0e690daa12aae 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -69,7 +69,7 @@ def obey(command, prefix, replay=False, do_record=False):
         print("Can't tokenize command string: " + str(err) + ".")
         return
     if len(tokens) > 0 and tokens[0] in commands_db \
-       and len(tokens) >= commands_db[tokens[0]][0] + 1:
+       and len(tokens) == commands_db[tokens[0]][0] + 1:
         if commands_db[tokens[0]][1]:
             commands_db[tokens[0]][2]()
         elif replay:
@@ -250,10 +250,10 @@ def command_quit():
 
 def command_turn(turn_string):
     """Set turn to what's described in turn_string."""
+    min = 0
+    max = 65535
     try:
         turn = int(turn_string)
-        min = 0
-        max = 65535
         if turn < min or turn > max:
             raise ValueError
         world_db["TURN"] = turn
@@ -264,10 +264,10 @@ def command_turn(turn_string):
 
 def command_makeworld(seed_string):
     # Mere dummy so far.
+    min = 0
+    max = 4294967295
     try:
         seed = int(seed_string)
-        min = 0
-        max = 4294967295
         if seed < min or seed > max:
             raise ValueError
         world_db["SEED_RANDOMNESS"] = seed