diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-08 18:06:38 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-08 18:06:38 +0000 |
| commit | 2543395e5cfd21d7a1c7d4e337272ccfeb08fd1c (patch) | |
| tree | 17723e37ed8d1866cb8678ac185677b8e7e6a5bb | |
| parent | 4fbbae2b1e8504ef3837b6d7095e1e8977157b94 (diff) | |
| download | hercules-2543395e5cfd21d7a1c7d4e337272ccfeb08fd1c.tar.gz hercules-2543395e5cfd21d7a1c7d4e337272ccfeb08fd1c.tar.bz2 hercules-2543395e5cfd21d7a1c7d4e337272ccfeb08fd1c.tar.xz hercules-2543395e5cfd21d7a1c7d4e337272ccfeb08fd1c.zip | |
Fixed @raise/@raisemap incorrect behavior which would heal everyone in the server/map despite being dead or not, Thanks to Joseph for reporting
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16762 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/atcommand.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 1e44376c9..fb8d3e02d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3173,12 +3173,9 @@ ACMD_FUNC(doommap) /*========================================== * *------------------------------------------*/ -static void atcommand_raise_sub(struct map_session_data* sd) -{ - if(pc_isdead(sd)) - status_revive(&sd->bl, 100, 100); - else - status_percent_heal(&sd->bl, 100, 100); +static void atcommand_raise_sub(struct map_session_data* sd) { + + status_revive(&sd->bl, 100, 100); clif_skill_nodamage(&sd->bl,&sd->bl,ALL_RESURRECTION,4,1); clif_displaymessage(sd->fd, msg_txt(63)); // Mercy has been shown. @@ -3196,7 +3193,8 @@ ACMD_FUNC(raise) iter = mapit_getallusers(); for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) - atcommand_raise_sub(pl_sd); + if( pc_isdead(pl_sd) ) + atcommand_raise_sub(pl_sd); mapit_free(iter); clif_displaymessage(fd, msg_txt(64)); // Mercy has been granted. @@ -3216,7 +3214,7 @@ ACMD_FUNC(raisemap) iter = mapit_getallusers(); for( pl_sd = (TBL_PC*)mapit_first(iter); mapit_exists(iter); pl_sd = (TBL_PC*)mapit_next(iter) ) - if (sd->bl.m == pl_sd->bl.m) + if (sd->bl.m == pl_sd->bl.m && pc_isdead(pl_sd) ) atcommand_raise_sub(pl_sd); mapit_free(iter); |