diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-18 17:16:06 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-11-18 17:16:06 +0000 |
| commit | 83752dab1d6888cb3bc74d14ff8ba30dfaeb2985 (patch) | |
| tree | f6f4c1d2da436d1bcf6a9c3fbe763fd75755b749 | |
| parent | 1ef8b3402619bf072930e530802401ebdf2fe980 (diff) | |
| download | hercules-83752dab1d6888cb3bc74d14ff8ba30dfaeb2985.tar.gz hercules-83752dab1d6888cb3bc74d14ff8ba30dfaeb2985.tar.bz2 hercules-83752dab1d6888cb3bc74d14ff8ba30dfaeb2985.tar.xz hercules-83752dab1d6888cb3bc74d14ff8ba30dfaeb2985.zip | |
Autotrade characters will no longer get caught by Urgent Recall. (bugreport:2447)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13375 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1b719a268..cb3065d5e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/11/18 + * Rev. 13375 Autotrade characters will no longer get caught by Urgent Recall. (bugreport:2447) [L0ne_W0lf] 2008/11/11 * Updated script_commands.txt [FlavioJS] * Made scripts terminate with an error: (fixes bugreport:2429) diff --git a/src/map/skill.c b/src/map/skill.c index 0923748da..fe1838eda 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5203,7 +5203,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in clif_skill_nodamage(src,bl,skillid,skilllv,1); for(i = 0; i < g->max_member; i++, j++) { if (j>8) j=0; - if ((dstsd = g->member[i].sd) != NULL && sd != dstsd && !pc_isdead(dstsd)) { + if ((dstsd = g->member[i].sd) != NULL && sd != dstsd && !pc_isdead(dstsd) && !dstsd->state.autotrade) { if (map[dstsd->bl.m].flag.nowarp && !map_flag_gvg2(dstsd->bl.m)) continue; if(map_getcell(src->m,src->x+dx[j],src->y+dy[j],CELL_CHKNOREACH)) |