summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/mob.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 09a00c80a..25c4784b2 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ 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.
+09/11/09
+ * Fixed mob is removed from map right after his rebirth. [Inkfish]
+ * Fixed dead event does not trigger when a mob has rebirth skill and dies for the second time. [Inkfish]
09/11/08
* Added a flag to indicate if the script of an autobonus was parsed for the sake of resourse saving. [Inkfish]
09/11/04
diff --git a/src/map/mob.c b/src/map/mob.c
index 9c74665a7..b2f6ce4ff 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1954,6 +1954,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
int i,temp,count,pnum=0,m=md->bl.m;
unsigned int mvp_damage, tick = gettick();
unsigned short flaghom = 1; // [Zephyrus] Does the mob only received damage from homunculus?
+ bool rebirth = ( md->sc.data[SC_KAIZEL] || (md->sc.data[SC_REBIRTH] && !md->state.rebirth) );
status = &md->status;
@@ -2370,7 +2371,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
//Emperium destroyed by script. Discard mvp character. [Skotlex]
mvp_sd = NULL;
- if( !md->sc.data[SC_KAIZEL] && !md->sc.data[SC_REBIRTH] )
+ if( !rebirth )
{ // Only trigger event on final kill
md->status.hp = 0; //So that npc_event invoked functions KNOW that mob is dead
if( src )
@@ -2424,8 +2425,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
if(!md->spawn) //Tell status_damage to remove it from memory.
return 5; // Note: Actually, it's 4. Oh well...
-
- mob_setdelayspawn(md); //Set respawning.
+
+ if( !rebirth )
+ mob_setdelayspawn(md); //Set respawning.
return 3; //Remove from map.
}