From f1ab07d49a32188f4203ce13f281de2d6a5786aa Mon Sep 17 00:00:00 2001
From: SantaSpeen <SantaSpeen@gmail.com>
Date: Wed, 26 Jul 2023 18:41:37 +0300
Subject: [PATCH] Small fixes

---
 src/core/core.py       | 4 ++--
 src/core/tcp_server.py | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/core.py b/src/core/core.py
index 1cc0fb7..14e95b3 100644
--- a/src/core/core.py
+++ b/src/core/core.py
@@ -303,10 +303,10 @@ class Core:
         ev.call_event("onServerStopped")
         await ev.call_async_event("onServerStopped")
         await self.__gracefully_kick()
+        if config.Options['use_lua']:
+            ev.call_event("_lua_plugins_unload")
         await ev.call_async_event("_plugins_unload")
-        ev.call_event("_lua_plugins_unload")
         self.run = False
         self.log.info(i18n.stop)
         if config.WebAPI["enabled"]:
             asyncio.run(self.web_stop())
-        # exit(0)
diff --git a/src/core/tcp_server.py b/src/core/tcp_server.py
index b1eef19..f84ffab 100644
--- a/src/core/tcp_server.py
+++ b/src/core/tcp_server.py
@@ -66,8 +66,6 @@ class TCPServer:
             if _client.nick == client.nick and _client.guest == client.guest:
                 await _client.kick(i18n.core_player_kick_stale)
 
-        client.log.info(i18n.core_player_set_id.format(client.pid))
-
         allow = True
         reason = i18n.core_player_kick_no_allowed_default_reason
 
@@ -90,6 +88,7 @@ class TCPServer:
         else:
             self.log.info(i18n.core_identifying_okay)
             await self.Core.insert_client(client)
+            client.log.info(i18n.core_player_set_id.format(client.pid))
 
         return True, client