Procházet zdrojové kódy

Improve message handler return code handling

Tankernn před 7 roky
rodič
revize
17caafab28
2 změnil soubory, kde provedl 7 přidání a 6 odebrání
  1. 4 0
      citybuilder/messagehandler.py
  2. 3 6
      citybuilder/player.py

+ 4 - 0
citybuilder/messagehandler.py

@@ -65,7 +65,11 @@ class MessageHandler:
             result = handler(player, message)
             if result is None:
                 result = {'result': 0}
+            elif isinstance(result, int):
+                result = {'result': result}
             result['context'] = message
+            if result['result'] != 0:
+                print("Message handler returned error code {}".format(result['result']))
             connection.send_json(result)
         else:
              connection.send_json({'result': 404})

+ 3 - 6
citybuilder/player.py

@@ -58,14 +58,11 @@ class Player:
 
     def add_job(self, product, requirements, cost):
         if not self.check_requirements(requirements):
-            return {
-                'result': 2
-            }
+            return 2
         if not self.resource_check(cost):
-            return {
-                'result': 1
-            }
+            return 1
         self.jobs.append(Job(self, product))
+        return 0
 
     def get_storage_space(self, resource):
         space = core.config['general']['storage'].get(resource, 0)