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/atcommand.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/atcommand.cpp')
| -rw-r--r-- | src/map/atcommand.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 7739966..71db4a3 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -2498,7 +2498,7 @@ ATCE atcommand_doom(Session *s, dumb_ptr<map_session_data> sd, if (!s2) continue; dumb_ptr<map_session_data> pl_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s2->session_data.get())); - if (pl_sd + if (pl_sd && !pl_sd->state.connect_new && pl_sd->state.auth && s2 != s && pc_isGM(sd).overwhelms(pc_isGM(pl_sd))) { @@ -2522,7 +2522,7 @@ ATCE atcommand_doommap(Session *s, dumb_ptr<map_session_data> sd, if (!s2) continue; dumb_ptr<map_session_data> pl_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s2->session_data.get())); - if (pl_sd + if (pl_sd && !pl_sd->state.connect_new && pl_sd->state.auth && s2 != s && sd->bl_m == pl_sd->bl_m && pc_isGM(sd).overwhelms(pc_isGM(pl_sd))) { @@ -3474,7 +3474,7 @@ ATCE atcommand_partyrecall(Session *s, dumb_ptr<map_session_data> sd, if (!s2) continue; dumb_ptr<map_session_data> pl_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s2->session_data.get())); - if (pl_sd && pl_sd->state.auth + if (pl_sd && pl_sd->state.auth && !pl_sd->state.connect_new && sd->status_key.account_id != pl_sd->status_key.account_id && pl_sd->status.party_id == p.party_id) { @@ -3889,7 +3889,7 @@ ATCE atcommand_effect(Session *s, dumb_ptr<map_session_data> sd, if (!s2) continue; dumb_ptr<map_session_data> pl_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s2->session_data.get())); - if (pl_sd && pl_sd->state.auth) + if (pl_sd && pl_sd->state.auth && !pl_sd->state.connect_new) { clif_specialeffect(pl_sd, type, flag); clif_displaymessage(pl_sd->sess, "Your Effect Has Changed."_s); @@ -4920,7 +4920,7 @@ ATCE atcommand_doomspot(Session *s, dumb_ptr<map_session_data> sd, if (!s2) continue; dumb_ptr<map_session_data> pl_sd = dumb_ptr<map_session_data>(static_cast<map_session_data *>(s2->session_data.get())); - if (pl_sd + if (pl_sd && !pl_sd->state.connect_new && pl_sd->state.auth && s2 != s && sd->bl_m == pl_sd->bl_m && sd->bl_x == pl_sd->bl_x && sd->bl_y == pl_sd->bl_y && pc_isGM(sd).overwhelms(pc_isGM(pl_sd))) |