SantaSpeen/KuiToi-Server
1
0
Fork 0
mirror of https://github.com/kuitoi/kuitoi-Server.git synced 2025-08-17 16:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change evens naming semantic

Browse Source
This commit is contained in:
Maxim Khomutov 2023-07-16 16:14:00 +03:00
parent a73b14f9b4
commit cd098571d9
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core.py
View File

@ -260,8 +260,8 @@ class Core:
self.run = True self.run = True
self.log.info(i18n.start) self.log.info(i18n.start)
ev.call_event("server_started") ev.call_event("onServerStarted")
await ev.call_async_event("server_started") await ev.call_async_event("onServerStarted")
await t # Wait end. await t # Wait end.
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
@ -278,8 +278,8 @@ class Core:
asyncio.run(self.main()) asyncio.run(self.main())
async def stop(self): async def stop(self):
ev.call_event("server_stopped") ev.call_event("onServerStopped")
await ev.call_async_event("server_stopped") await ev.call_async_event("onServerStopped")
await ev.call_async_event("_plugins_unload") await ev.call_async_event("_plugins_unload")
self.run = False self.run = False
self.log.info(i18n.stop) self.log.info(i18n.stop)

4
src/core/tcp_server.py
View File

@ -41,7 +41,7 @@ class TCPServer:
await client.kick("Invalid Key (too long)!") await client.kick("Invalid Key (too long)!")
return False, client return False, client
client._key = data.decode("utf-8") client._key = data.decode("utf-8")
ev.call_event("auth_sent_key", player=client) ev.call_event("onPlayerSentKey", player=client)
try: try:
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session:
url = 'https://auth.beammp.com/pkToUser' url = 'https://auth.beammp.com/pkToUser'
@ -71,7 +71,7 @@ class TCPServer:
await client.kick('Stale Client (replaced by new client)') await client.kick('Stale Client (replaced by new client)')
return False, client return False, client
ev.call_event("auth_ok", player=client) ev.call_event("onPlayerAuthenticated", player=client)
if len(self.Core.clients_by_id) > config.Game["players"]: if len(self.Core.clients_by_id) > config.Game["players"]:
# TODO: i18n # TODO: i18n

22
src/modules/EventsSystem/events_system.py
View File

@ -22,20 +22,18 @@ class EventsSystem:
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
self.as_tasks = [] self.as_tasks = []
self.__events = { self.__events = {
"server_started": [], "onServerStarted": [],
"auth_sent_key": [], # Only sync "onPlayerSentKey": [], # Only sync
"auth_ok": [], # Only sync "onPlayerAuthenticated": [], # Only sync
"player_join": [], "onPlayerJoin": [],
"chat_receive": [], "onChatReceive": [],
"server_stopped": [], "onServerStopped": [],
} }
self.__async_events = { self.__async_events = {
"server_started": [], "onServerStarted": [],
"_plugins_start": [], "onPlayerJoin": [],
"_plugins_unload": [], "onChatReceive": [],
"player_join": [], "onServerStopped": []
"chat_receive": [],
"server_stopped": []
} }
def builtins_hook(self): def builtins_hook(self):