diff options
| author | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-10-18 21:17:34 +0000 |
|---|---|---|
| committer | sketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-10-18 21:17:34 +0000 |
| commit | ff8324394986ee9418d9abd39b40c0329100dbff (patch) | |
| tree | 93eac43bc345bb4e5de7ae30f088dab873b1c0fa | |
| parent | e909ba974598914ed5ce9cddee6107aadacbadfa (diff) | |
| download | hercules-ff8324394986ee9418d9abd39b40c0329100dbff.tar.gz hercules-ff8324394986ee9418d9abd39b40c0329100dbff.tar.bz2 hercules-ff8324394986ee9418d9abd39b40c0329100dbff.tar.xz hercules-ff8324394986ee9418d9abd39b40c0329100dbff.zip | |
* Corrected a target checking problem brought about with Kaizel/Osiris combination.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13308 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f1962e064..4a310c4a1 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/10/18 + * Corrected a target checking problem brought about with Kaizel/Osiris combination. [SketchyPhoenix] 2008/10/16 * Added missing char_sql/int_mercenary files to txt-converter's Makefile.in. [FlavioJS] 2008/10/15 diff --git a/src/map/status.c b/src/map/status.c index 8e3734bd2..9806a214a 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -783,7 +783,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s { //flag&8 = disable Kaizel int time = skill_get_time2(SL_KAIZEL,sc->data[SC_KAIZEL]->val1); //Look for Osiris Card's bonus effect on the character and revive 100% or revive normally - if ( BL_CAST(BL_PC,target)->special_state.restart_full_recover == 1 ) + if ( target->type == BL_PC && BL_CAST(BL_PC,target)->special_state.restart_full_recover == 1 ) status_revive(target, 100, 100); else status_revive(target, sc->data[SC_KAIZEL]->val2, 0); |