From 13be12a7a1f87db7290be9e00176b5d98ae8a945 Mon Sep 17 00:00:00 2001 From: SantaSpeen Date: Wed, 26 Jul 2023 01:09:28 +0300 Subject: [PATCH] Added event onCarChanged; --- src/core/Client.py | 4 +-- src/modules/EventsSystem/events_system.py | 32 ++++++++++++----------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/core/Client.py b/src/core/Client.py index 681f523..d8f086f 100644 --- a/src/core/Client.py +++ b/src/core/Client.py @@ -541,8 +541,8 @@ class Client: cid, car_id = self._get_cid_vid(raw_data[5:]) if car_id != -1 and cid == self.cid and self._cars[car_id]: data = raw_data[raw_data.find("{"):] - ev.call_event("onCar", car_id=car_id, data=data) - await ev.call_async_event("onCarFocusMove", car_id=car_id, data=data) + ev.call_event("onCarChanged", car_id=car_id, data=data) + await ev.call_async_event("onCarChanged", car_id=car_id, data=data) await self._send(raw_data, to_all=True, to_self=False) case "m": # Move focus car diff --git a/src/modules/EventsSystem/events_system.py b/src/modules/EventsSystem/events_system.py index 8ec3437..94fbb1b 100644 --- a/src/modules/EventsSystem/events_system.py +++ b/src/modules/EventsSystem/events_system.py @@ -22,21 +22,21 @@ class EventsSystem: self.loop = asyncio.get_event_loop() self.as_tasks = [] self.__events = { - "onServerStarted": [], - "onPlayerSentKey": [], # Only sync - "onPlayerAuthenticated": [], # Only sync - "onPlayerJoin": [], - "onChatReceive": [], - "onCarSpawn": [], - "onCarDelete": [], - "onCarEdited": [], - "onCarReset": [], - "" - "onCarFocusMove": [], - "onSentPing": [], # Only sync - "onChangePosition": [], # Only sync - "onPlayerDisconnect": [], - "onServerStopped": [], + "onServerStarted": [], # No handler + "onPlayerSentKey": [], # Only sync, no handler + "onPlayerAuthenticated": [], # (!) Only sync, With handler + "onPlayerJoin": [], # (!) With handler + "onChatReceive": [], # (!) With handler + "onCarSpawn": [], # (!) With handler + "onCarDelete": [], # (!) With handler (admin allow) + "onCarEdited": [], # (!) With handler + "onCarReset": [], # No handler + "onCarChanged": [], # No handler + "onCarFocusMove": [], # No handler + "onSentPing": [], # Only sync, no handler + "onChangePosition": [], # Only sync, no handler + "onPlayerDisconnect": [], # No handler + "onServerStopped": [], # No handler } self.__async_events = { "onServerStarted": [], @@ -46,6 +46,8 @@ class EventsSystem: "onCarDelete": [], "onCarEdited": [], "onCarReset": [], + "onCarChanged": [], + "onCarFocusMove": [], "onPlayerDisconnect": [], "onServerStopped": [] }