- Added function battle_attr_ratio to handle just getting the attribute table data. Fixes Sense messing up with elemental based statuses.

- Added Throw tomahawk to the list of items that do not trigger the equipment breaking code.
- Moved a bit around the SC_ start of dancing skills to fix Moonlight petals pushing back the casters.
- Modified status_damage to handle SC_KAZIEL. The return value of *_dead functions can pass 8 to specify that kaziel should not be triggered (ie: pvp/gvg)
- Infinite Endure won't be passed on to devoted characters.
- Infinite Endure is no longer saved on logout.
- Added check to avoid gms opening vending shops if they don't have the required level.
- Moved around the Steel Body S. Novice code, simplified it so it triggers before most of the penalties (death is cancelled).
- Fixed the flee penalty not applying when you walk into a gvg map.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12688 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 8 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index d50f9ddd0..ac81e23e1 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -890,7 +890,7 @@ int mob_linksearch(struct block_list *bl,va_list ap)
 static int mob_delayspawn(int tid, unsigned int tick, int id, intptr data)
 {
 	struct block_list *bl = map_id2bl(id);
-	if (bl && bl->type == BL_MOB)
+	if (bl && bl->type == BL_MOB && bl->prev == NULL)
 		mob_spawn((TBL_MOB*)bl);
 	return 0;
 }
@@ -2095,13 +2095,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 	md->state.skillstate = MSS_DEAD;	
 	mobskill_use(md,tick,-1);	//On Dead skill.
 
-	if (md->sc.data[SC_KAIZEL])
-	{	//Revive in a bit.
-		add_timer(gettick()+3000, mob_respawn, md->bl.id, md->sc.data[SC_KAIZEL]->val2); //% of life to rebirth with
-		map_delblock(&md->bl);
-		return 1; //Return 1 to only clear the object.
-	}
-
 	map_freeblock_lock();
 
 	memset(pt,0,sizeof(pt));