From d582d06bfb0ea3239d1c61b355ab3427318e915d Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Thu, 7 May 2015 11:22:25 -0400
Subject: wait for the player to be added to block list

---
 src/map/pc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/map/pc.cpp')

diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 6fa35b0..80abb73 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -517,6 +517,7 @@ int pc_setnewpc(dumb_ptr<map_session_data> sd, AccountId account_id, CharId char
     (void)client_tick;
     sd->sex = sex;
     sd->state.auth = 0;
+    sd->state.connect_new = 0;
     sd->bl_type = BL::PC;
     sd->canact_tick = sd->canmove_tick = gettick();
     sd->canlog_tick = gettick();
@@ -795,7 +796,6 @@ int pc_authok(AccountId id, int login_id2,
 
     pc_calcstatus(sd, 1);
 
-    npc_event_doall_l(stringish<ScriptLabel>("OnPCLoginEvent"_s), sd->bl_id, nullptr);
     // Init Quest Log
     clif_sendallquest(sd);
     return 0;
@@ -812,6 +812,7 @@ void pc_show_motd(dumb_ptr<map_session_data> sd)
     // the license does not permit you to publicly use this software.
 
     clif_displaymessage(sd->sess, "This server is Free Software, for details type @source in chat or use the tmwa-source tool"_s);
+    npc_event_doall_l(stringish<ScriptLabel>("OnPCLoginEvent"_s), sd->bl_id, nullptr);
 
     sd->state.seen_motd = true;
     io::ReadFile in(map_conf.motd_txt);
-- 
cgit v1.2.3-60-g2f50