Merge pull request #34 from Yepoleb/duplicate

Skip already yielded addresses in MasterServerQuerier
serverstf · Aug 28, 2017 · b371a9b · b371a9b
2 parents 7203f85 + 7e4f7fd
commit b371a9b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/valve/source/master_server.py b/valve/source/master_server.py
@@ -73,6 +73,7 @@ def _query(self, region, filter_string):
         """
         last_addr = "0.0.0.0:0"
         first_request = True
+        previous_addr = set()
         while first_request or last_addr != "0.0.0.0:0":
             first_request = False
             self.request(messages.MasterServerRequest(region=region,
@@ -85,10 +86,15 @@ def _query(self, region, filter_string):
             else:
                 response = messages.MasterServerResponse.decode(raw_response)
                 for address in response["addresses"]:
-                    last_addr = "{}:{}".format(
-                        address["host"], address["port"])
+                    addr_tuple = (address["host"], address["port"])
+                    if addr_tuple in previous_addr:
+                        # Skip already yielded address
+                        continue
+                    else:
+                        previous_addr.add(addr_tuple)
+                    last_addr = "{}:{}".format(*addr_tuple)
                     if not address.is_null:
-                        yield address["host"], address["port"]
+                        yield addr_tuple
 
     def _map_region(self, region):
         """Convert string to numeric region identifier