Browse Source

* Corrected a target checking problem brought about with Kaizel/Osiris combination.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13308 54d463be-8e91-2dee-dedb-b68131a5f0ec
sketchyphoenix 16 years ago
parent
commit
c8ee515fed
2 changed files with 3 additions and 1 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/status.c

+ 2 - 0
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

+ 1 - 1
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);