diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-11 20:51:13 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-11 20:51:13 -0500 |
| commit | 287a252b47cda8f0b47c1e6f84fc3ee30e93ae7f (patch) | |
| tree | 1485b0c9fb2a61bc7ac16d1af2cd76e4e87bf101 /src/map/atcommand.cpp | |
| parent | da02d3d622cc24384284952798b5a9c6e3e386d5 (diff) | |
| parent | a4d9d4b93b3e1dffad33f96f3eecc04fb0c4bec7 (diff) | |
| download | tmwa-287a252b47cda8f0b47c1e6f84fc3ee30e93ae7f.tar.gz tmwa-287a252b47cda8f0b47c1e6f84fc3ee30e93ae7f.tar.bz2 tmwa-287a252b47cda8f0b47c1e6f84fc3ee30e93ae7f.tar.xz tmwa-287a252b47cda8f0b47c1e6f84fc3ee30e93ae7f.zip | |
Merge pull request #87 from mekolat/auth
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 46d857d..63a1159 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))) |