- Casting Kaensin will clear out Suiton and viceversa now.

- Fixed drop-rates (@whodrops) getting duplicates when you use @reloadmobdb
- Fixed unjailing not sending characters to Prontera.


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

4 files changed, 12 insertions, 18 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 76e5cd9db..1da8be43b 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -6523,9 +6523,7 @@ int atcommand_unjail(
 		return -1;

 	}

 

-	m_index = mapindex_name2id(MAP_JAIL);

-

-	if (pl_sd->mapindex != m_index) {

+	if (pl_sd->mapindex != mapindex_name2id(MAP_JAIL)) {

 		clif_displaymessage(fd, msg_table[119]); // This player is not in jails.

 		return -1;

 	}

@@ -6536,7 +6534,8 @@ int atcommand_unjail(
 		x =  pl_sd->sc.data[SC_JAILED].val4&0xFFFF;

 		y =  pl_sd->sc.data[SC_JAILED].val4>>16;

 		status_change_end(&pl_sd->bl,SC_JAILED,-1);

-	}

+	} else

+		m_index = mapindex_name2id(MAP_PRONTERA);

 	

 	if (pc_setpos(pl_sd, m_index, x, y, 3) == 0 ||

  		pc_setpos(pl_sd, mapindex_name2id(MAP_PRONTERA), 0, 0, 3) == 0

diff --git a/src/map/mob.c b/src/map/mob.c
index cea8b388a..eea96d008 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3359,7 +3359,8 @@ static int mob_readdb(void)
 					if (k == MAX_SEARCH)
 						continue;
 				
-					memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
+					if (id->mob[k].id != class_)
+						memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
 					id->mob[k].chance = mob_db_data[class_]->dropitem[i].p;
 					id->mob[k].id = class_;
 				}
@@ -4028,8 +4029,8 @@ static int mob_read_sqldb(void)
 						}
 						if (k == MAX_SEARCH)
 							continue;
-					
-						memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
+						if (id->mob[k].id != class_)
+							memmove(&id->mob[k+1], &id->mob[k], (MAX_SEARCH-k-1)*sizeof(id->mob[0]));
 						id->mob[k].chance = mob_db_data[class_]->dropitem[i].p;
 						id->mob[k].id = class_;
 					}
diff --git a/src/map/pc.c b/src/map/pc.c
index dc9134fa8..4c5046b4d 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3267,7 +3267,7 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 	{	//Misc map-changing settings
 		party_send_dot_remove(sd); //minimap dot fix [Kevin]
 		guild_send_dot_remove(sd);
-		skill_clear_group(&sd->bl, 1|4|(battle_config.traps_setting&2));
+		skill_clear_group(&sd->bl, 1|(battle_config.traps_setting&2));
 		if (sd->sc.count)
 		{ //Cancel some map related stuff.
 			if (sd->sc.data[SC_WARM].timer != -1)
diff --git a/src/map/skill.c b/src/map/skill.c
index 530d0ee99..2b3301547 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2732,8 +2732,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 		break;
 
 	case TK_JUMPKICK:
-		if (skillid == TK_JUMPKICK)
-			skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
+		skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
 		if (unit_movepos(src, bl->x, bl->y, 0, 0))
 			clif_slide(src,bl->x,bl->y);
 		break;
@@ -6661,7 +6660,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
 		if (sd) val1 = sd->status.child;
 		break;
 	case NJ_KAENSIN:
-		skill_clear_group(src, 4); //Delete previous Kaensins
+		skill_clear_group(src, 1); //Delete previous Kaensins/Suitons
 		val2 = (skilllv+1)/2 + 4;
 		break;
 
@@ -9162,11 +9161,8 @@ int skill_clear_group (struct block_list *bl, int flag)
 			case SA_VIOLENTGALE:
 			case SA_LANDPROTECTOR:
 			case NJ_SUITON:
-				if (flag&1)
-					group[count++]= ud->skillunit[i];
-				break;
 			case NJ_KAENSIN:
-				if (flag&4)
+				if (flag&1)
 					group[count++]= ud->skillunit[i];
 				break;
 			default:
@@ -9876,9 +9872,7 @@ int skill_unit_timer_sub (struct block_list *bl, va_list ap)
 	struct skill_unit_group *group;
 	unsigned int tick;
 
-	nullpo_retr(0, bl);
-	nullpo_retr(0, ap);
-	nullpo_retr(0, unit=(struct skill_unit *)bl);
+	unit=(struct skill_unit *)bl;
 	tick=va_arg(ap,unsigned int);
 
 	if(!unit->alive)