From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 3 Dec 2020 01:12:13 +0000 (+0100)
Subject: Fix faulty main loop, comment out inactive cause buggy) flood protection.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/static/%7B%7Bdb.prefix%7D%7D/task?a=commitdiff_plain;h=fd98b77dfea09c0481b0e8be1204b6439eea80da;p=plomrogue2

Fix faulty main loop, comment out inactive cause buggy) flood protection.
---

diff --git a/plomrogue/io.py b/plomrogue/io.py
index 252fac1..8110647 100644
--- a/plomrogue/io.py
+++ b/plomrogue/io.py
@@ -17,19 +17,22 @@ class GameIO():
         """Handle commands coming through queue q, run game, send results back.
 
         As basic flood protection, Only accepts one command per connection per
-        1/100 of a second.
+        1/100 of a second (currently commented out).
 
         """
         import time
         potential_flooders = {}
         while True:
             try:
-                command, connection_id = q.get(timeout=0.001)
-                if connection_id in potential_flooders:
-                    if int(time.time() * 100) == potential_flooders[connection_id]:
-                        continue
-                potential_flooders[connection_id] = int(time.time() * 100)
-                self.handle_input(connection_id, command)
+                connection_id, command = q.get(timeout=0.001)
+
+                # FIXME: this would catch the init command flood
+                #if connection_id in potential_flooders:
+                #    if int(time.time() * 100) == potential_flooders[connection_id]:
+                #        continue
+                #potential_flooders[connection_id] = int(time.time() * 100)
+
+                self.handle_input(command, connection_id)
             except queue.Empty:
                 self.game.run_tick()
 
@@ -38,6 +41,7 @@ class GameIO():
 
         The game loop works sequentially through game commands received
         via self.queue from connected servers' clients."""
+
         self.queue = queue.Queue()
         c = threading.Thread(target=self.loop, args=(self.queue,))
         c.start()