diff options
| author | gumi <git@gumi.ca> | 2018-03-04 17:22:02 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-03-04 17:22:02 -0500 |
| commit | 821a51521b537dc8b95d97a578321f68a3b9e26b (patch) | |
| tree | 03250a17b94dd38605b90078b6b23e176a4364c8 | |
| parent | c58cbd9adea1c87da56d36eea222aa8932dc3835 (diff) | |
| download | tmwa-821a51521b537dc8b95d97a578321f68a3b9e26b.tar.gz tmwa-821a51521b537dc8b95d97a578321f68a3b9e26b.tar.bz2 tmwa-821a51521b537dc8b95d97a578321f68a3b9e26b.tar.xz tmwa-821a51521b537dc8b95d97a578321f68a3b9e26b.zip | |
allow @goto and @chareffect on higher GM levels if not hidden
| -rw-r--r-- | src/map/atcommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 7167b63..81b0e2b 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -674,7 +674,7 @@ ATCE atcommand_goto(Session *s, dumb_ptr<map_session_data> sd, } dumb_ptr<map_session_data> pl_sd = map_nick2sd(character); - if (pl_sd != nullptr && pc_isGM(sd).detects(pc_isGM(pl_sd))) + if (pl_sd != nullptr && (!bool(pl_sd->status.option & Opt0::HIDE) || pc_isGM(sd).detects(pc_isGM(pl_sd)))) { if (pl_sd->bl_m->flag.get(MapFlag::NOWARPTO) && !(pc_isGM(sd).satisfies(battle_config.any_warp_GM_min_level))) @@ -4316,7 +4316,7 @@ ATCE atcommand_chareffect(Session *s, dumb_ptr<map_session_data> sd, return ATCE::USAGE; dumb_ptr<map_session_data> pl_sd = map_nick2sd(target); - if (pl_sd == nullptr || (pl_sd != nullptr && !(pc_isGM(sd).detects(pc_isGM(pl_sd))))) + if (pl_sd == nullptr || (bool(pl_sd->status.option & Opt0::HIDE) && !pc_isGM(sd).detects(pc_isGM(pl_sd)))) return ATCE::EXIST; clif_specialeffect(pl_sd, type, 0); |