Fix self.rlbot_server_port not being used

Author: VirxEC

rlbot/interface.py

@@ -214,7 +214,9 @@ def connect(
                 if time.time() > begin_time + next_warning:
                     next_warning *= 2
                     self.logger.warning(
-                        "Connection is being refused/aborted. Trying again ..."
+                        "Connection is being refused/aborted on %s:%s. Trying again ...",
+                        rlbot_server_ip,
+                        rlbot_server_port,
                     )
             if not self.is_connected:
                 raise ConnectionRefusedError(

rlbot/managers/match.py

@@ -70,7 +70,7 @@ def connect(
         wants_ball_predictions: bool,
         close_between_matches: bool = True,
         rlbot_server_ip: str = RLBOT_SERVER_IP,
-        rlbot_server_port: int = RLBOT_SERVER_PORT,
+        rlbot_server_port: Optional[int] = None,
     ):
         """
         Connects to the RLBot server specifying the given settings.
@@ -85,7 +85,7 @@ def connect(
             wants_ball_predictions=wants_ball_predictions,
             close_between_matches=close_between_matches,
             rlbot_server_ip=rlbot_server_ip,
-            rlbot_server_port=rlbot_server_port,
+            rlbot_server_port=rlbot_server_port or self.rlbot_server_port,
         )
 
     def wait_for_first_packet(self):
@@ -107,7 +107,7 @@ def start_match(
         self.ensure_server_started()
 
         if not self.rlbot_interface.is_connected:
-            self.rlbot_interface.connect(
+            self.connect(
                 wants_match_communications=False,
                 wants_ball_predictions=False,
                 close_between_matches=False,

rlbot/version.py

@@ -1 +1 @@
-__version__ = "2.0.0-beta.33"
+__version__ = "2.0.0-beta.34"