diff --git a/src/core/Client.py b/src/core/Client.py index 1a32bfa..89ad424 100644 --- a/src/core/Client.py +++ b/src/core/Client.py @@ -380,7 +380,7 @@ class Client: car_json = json.loads(data[data.find("{"):]) except Exception as e: self.log.debug(f"Invalid car_json: Error: {e}; Data: {car_data}") - allow = True + # allow = True over_spawn = False # TODO: Call event onCarSpawn pkt = f"Os:{self.roles}:{self.nick}:{self.cid}-{car_id}:{car_data}" @@ -515,6 +515,7 @@ class Client: to_client = ev_data.get("to_client") writer = None if to_client: + # noinspection PyProtectedMember writer = to_client._writer await self._send(f"C:{message}", to_all=to_all, to_self=to_self, writer=writer) need_send = False diff --git a/src/core/core.py b/src/core/core.py index 11d76b9..c614e33 100644 --- a/src/core/core.py +++ b/src/core/core.py @@ -20,6 +20,7 @@ from modules import PluginsLoader from modules.WebAPISystem import app as webapp +# noinspection PyProtectedMember class Core: def __init__(self): @@ -145,10 +146,10 @@ class Core: modstotal = len(self.mods_list) - 1 while self.run: try: - data = {"uuid": config.Auth["key"], "players": len(self.clients_by_id), "maxplayers": config.Game["players"], - "port": config.Server["server_port"], "map": f"/levels/{config.Game['map']}/info.json", - "private": config.Auth['private'], "version": self.BeamMP_version, - "clientversion": self.client_major_version, + data = {"uuid": config.Auth["key"], "players": len(self.clients_by_id), + "maxplayers": config.Game["players"], "port": config.Server["server_port"], + "map": f"/levels/{config.Game['map']}/info.json", "private": config.Auth['private'], + "version": self.BeamMP_version, "clientversion": self.client_major_version, "name": config.Server["name"], "modlist": modlist, "modstotalsize": modstotalsize, "modstotal": modstotal, "playerslist": "", "desc": config.Server['description'], "pass": False} self.log.debug(f"Auth: data {data}") diff --git a/src/core/tcp_server.py b/src/core/tcp_server.py index 94aabb9..1f21c65 100644 --- a/src/core/tcp_server.py +++ b/src/core/tcp_server.py @@ -12,6 +12,7 @@ import aiohttp from core import utils +# noinspection PyProtectedMember class TCPServer: def __init__(self, core, host, port): self.log = utils.get_logger("TCPServer") diff --git a/src/core/udp_server.py b/src/core/udp_server.py index fa587d2..4ea680b 100644 --- a/src/core/udp_server.py +++ b/src/core/udp_server.py @@ -5,7 +5,6 @@ # Licence: FPA # (c) kuitoi.su 2023 import asyncio -import traceback from core import utils diff --git a/src/core/utils.py b/src/core/utils.py index c12b24a..a8b5957 100644 --- a/src/core/utils.py +++ b/src/core/utils.py @@ -20,8 +20,8 @@ logging.basicConfig(level=log_level, format=log_format) if not os.path.exists(log_dir): os.mkdir(log_dir) if os.path.exists(log_file): - mtime = os.path.getmtime(log_file) - gz_path = log_dir + datetime.datetime.fromtimestamp(mtime).strftime('%d.%m.%Y') + "-%s.tar.gz" + ftime = os.path.getmtime(log_file) + gz_path = log_dir + datetime.datetime.fromtimestamp(ftime).strftime('%d.%m.%Y') + "-%s.tar.gz" index = 1 while True: if not os.path.exists(gz_path % index):