- Fixed skill name for skill 39 (MC_PUSHCART)

- Corrected some formatting in a few entries in skill_db (TODO: if you really want to format the file to have file names aligned, spaces should be used instead of tabs, like it was done for GD/HLIF skills!)
- Corrected placement of leveled up mobs bonus exp
- Fixed a possible crash when parsing MSC_MASTERATTACKED mob skills.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/map/mob.c b/src/map/mob.c
index efe19b507..b5089cab5 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1871,10 +1871,10 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 				(i==2 && sd->sc.data[SC_MIRACLE]) //Miracle only applies to Star target
 			))
 				bonus += (i==2?20:10)*pc_checkskill(sd,sg_info[i].bless_id);
-
-			if(battle_config.mobs_level_up && md->level > md->db->lv) // [Valaris]
-				bonus += (md->level-md->db->lv)*battle_config.mobs_level_up_exp_rate;
 		}
+		if(battle_config.mobs_level_up && md->level > md->db->lv) // [Valaris]
+			bonus += (md->level-md->db->lv)*battle_config.mobs_level_up_exp_rate;
+
 	for(i = 0; i < DAMAGELOG_SIZE && md->dmglog[i].id; i++)
 	{
 		int flag=1,zeny=0;
@@ -2774,7 +2774,7 @@ int mobskill_use(struct mob_data *md, unsigned int tick, int event)
 				case MSC_MASTERHPLTMAXRATE:
 					flag = ((fbl = mob_getmasterhpltmaxrate(md, ms[i].cond2)) != NULL); break;
 				case MSC_MASTERATTACKED:
-					flag = (md->master_id > 0 && unit_counttargeted(map_id2bl(md->master_id), 0) > 0); break;
+					flag = (md->master_id > 0 && (fbl=map_id2bl(md->master_id)) && unit_counttargeted(fbl, 0) > 0); break;
 				case MSC_ALCHEMIST:
 					flag = (md->state.alchemist);
 					break;