summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-22 22:20:04 +0000
committerxantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-22 22:20:04 +0000
commit23fd682c39df4425be579a601525959dc391322e (patch)
treeec0b660c41edc02a5202fa99cffe520fdad8b016
parent49793c1ea2a762b008bd56cb479d15b74317b98d (diff)
downloadhercules-23fd682c39df4425be579a601525959dc391322e.tar.gz
hercules-23fd682c39df4425be579a601525959dc391322e.tar.bz2
hercules-23fd682c39df4425be579a601525959dc391322e.tar.xz
hercules-23fd682c39df4425be579a601525959dc391322e.zip
- Fixed Emergency Call (bugreport:3291) so that it does not recall dead guild members
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15934 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 0b608805f..d4a2f4c8c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7030,7 +7030,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 && !dstsd->state.autotrade) {
+ if ((dstsd = g->member[i].sd) != NULL && sd != dstsd && !dstsd->state.autotrade && !pc_isdead(dstsd)) {
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))