diff options
author | mekolat <mekolat@users.noreply.github.com> | 2015-05-07 11:22:25 -0400 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2015-05-07 11:22:25 -0400 |
commit | d582d06bfb0ea3239d1c61b355ab3427318e915d (patch) | |
tree | d285a016f1c217ad0b47a92253d17e1ad3a35571 /src/map/clif.cpp | |
parent | 784ca0b6ec91ecd66019ea915e897ecca4adbed0 (diff) | |
download | tmwa-d582d06bfb0ea3239d1c61b355ab3427318e915d.tar.gz tmwa-d582d06bfb0ea3239d1c61b355ab3427318e915d.tar.bz2 tmwa-d582d06bfb0ea3239d1c61b355ab3427318e915d.tar.xz tmwa-d582d06bfb0ea3239d1c61b355ab3427318e915d.zip |
wait for the player to be added to block list
Diffstat (limited to 'src/map/clif.cpp')
-rw-r--r-- | src/map/clif.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp index d327286..6074c43 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -165,7 +165,7 @@ int clif_countusers(void) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth && !(battle_config.hide_GM_session && pc_isGM(sd))) + if (sd && sd->state.auth && !sd->state.connect_new && !(battle_config.hide_GM_session && pc_isGM(sd))) users++; } return users; @@ -183,7 +183,7 @@ int clif_foreachclient(std::function<void (dumb_ptr<map_session_data>)> func) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth) + if (sd && sd->state.auth && !sd->state.connect_new) func(sd); } return 0; @@ -295,7 +295,7 @@ int clif_send(const Buffer& buf, dumb_ptr<block_list> bl, SendWho type) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth) + if (sd && sd->state.auth && !sd->state.connect_new) { { send_buffer(s, buf); @@ -310,7 +310,7 @@ int clif_send(const Buffer& buf, dumb_ptr<block_list> bl, SendWho type) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth && sd->bl_m == bl->bl_m) + if (sd && sd->state.auth && !sd->state.connect_new && sd->bl_m == bl->bl_m) { { send_buffer(s, buf); @@ -388,7 +388,7 @@ int clif_send(const Buffer& buf, dumb_ptr<block_list> bl, SendWho type) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth) + if (sd && sd->state.auth && !sd->state.connect_new) { if (sd->partyspy == p.party_id) { @@ -3221,7 +3221,7 @@ int clif_specialeffect(dumb_ptr<block_list> bl, int type, int flag) if (!s) continue; dumb_ptr<map_session_data> sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s->session_data.get())); - if (sd && sd->state.auth && sd->bl_m == bl->bl_m) + if (sd && sd->state.auth && !sd->state.connect_new && sd->bl_m == bl->bl_m) clif_specialeffect(sd, type, 1); } } |