- Disabling status abnormalities will now reset a mob's target.

- Mob morphing also resets their target now.
- Monk combos no longer can ignore skill delay (delay skill for all their combo-related skills is ASPD)


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

1 files changed, 6 insertions, 0 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index da0e28ea5..cc6a59cb1 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1076,7 +1076,10 @@ static int mob_ai_sub_hard(struct block_list *bl,va_list ap)
 
 	// Abnormalities
 	if((md->sc.opt1 > 0 && md->sc.opt1 != OPT1_STONEWAIT) || md->sc.data[SC_BLADESTOP].timer != -1)
+  	{	//Should reset targets.
+		md->target_id = md->attacked_id = 0;
 		return 0;
+	}
 
 	if (md->sc.count && md->sc.data[SC_BLIND].timer != -1)
 		view_range = 3;
@@ -2331,6 +2334,9 @@ int mob_class_change (struct mob_data *md, int class_)
 	if(md->lootitem == NULL && md->db->status.mode&MD_LOOTER)
 		md->lootitem=(struct item *)aCalloc(LOOTITEM_SIZE,sizeof(struct item));
 
+	//Targets should be cleared no morph
+	md->target_id = md->attacked_id = 0;
+
 	//Need to update name display.
 	clif_charnameack(0, &md->bl);