1 files changed, 45 insertions, 39 deletions

diff --git a/src/map/status.c b/src/map/status.c
index 4367f6243..7e16faeeb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1752,14 +1752,16 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin
 				bool is_detect = ((st->mode&MD_DETECTOR)?true:false);//god-knows-why gcc doesn't shut up until this happens
 				if (pc_isinvisible(sd))
 					return 0;
-				if (tsc->option&hide_flag && !is_boss &&
-					((sd->special_state.perfect_hiding || !is_detect) ||
-					(tsc->data[SC_CLOAKINGEXCEED] && is_detect)))
-					return 0;
-				if( tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect) && !skill_id )
-					return 0;
-				if( tsc->data[SC_STEALTHFIELD] && !is_boss )
-					return 0;
+				if( tsc ) {
+					if (tsc->option&hide_flag && !is_boss &&
+						((sd->special_state.perfect_hiding || !is_detect) ||
+						(tsc->data[SC_CLOAKINGEXCEED] && is_detect)))
+						return 0;
+					if( tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect) && !skill_id )
+						return 0;
+					if( tsc->data[SC_STEALTHFIELD] && !is_boss )
+						return 0;
+				}
 			}
 			break;
 		case BL_ITEM:	//Allow targetting of items to pick'em up (or in the case of mobs, to loot them).
@@ -1792,38 +1794,41 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin
 //Checks whether the source can see and chase target.
 int status_check_visibility(struct block_list *src, struct block_list *target) {
 	int view_range;
-	struct status_data *st = status->get_status_data(src);
-	struct status_change *tsc = status->get_sc(target);
+	struct status_change *tsc = NULL;
+	
 	switch (src->type) {
-	case BL_MOB:
-		view_range = ((TBL_MOB*)src)->min_chase;
-		break;
-	case BL_PET:
-		view_range = ((TBL_PET*)src)->db->range2;
-		break;
-	default:
-		view_range = AREA_SIZE;
+		case BL_MOB:
+			view_range = ((TBL_MOB*)src)->min_chase;
+			break;
+		case BL_PET:
+			view_range = ((TBL_PET*)src)->db->range2;
+			break;
+		default:
+			view_range = AREA_SIZE;
 	}
 
 	if (src->m != target->m || !check_distance_bl(src, target, view_range))
 		return 0;
 
-	if( tsc && tsc->data[SC_STEALTHFIELD] )
-		return 0;
-
-	switch (target->type)
-	{	//Check for chase-walk/hiding/cloaking opponents.
-	case BL_PC:
-		if ( tsc->data[SC_CLOAKINGEXCEED] && !(st->mode&MD_BOSS) )
-			return 0;
-		if( (tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) || tsc->data[SC__INVISIBILITY] || tsc->data[SC_CAMOUFLAGE]) && !(st->mode&MD_BOSS) &&
-			( ((TBL_PC*)target)->special_state.perfect_hiding || !(st->mode&MD_DETECTOR) ) )
-			return 0;
-		break;
-	default:
-		if( tsc && (tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) || tsc->data[SC__INVISIBILITY] || tsc->data[SC_CAMOUFLAGE]) && !(st->mode&(MD_BOSS|MD_DETECTOR)) )
+	if( ( tsc = status->get_sc(target) ) ) {
+		struct status_data *st = status->get_status_data(src);
+		
+		if( tsc->data[SC_STEALTHFIELD] )
 			return 0;
 
+		switch (target->type) { //Check for chase-walk/hiding/cloaking opponents.
+			case BL_PC:
+				if ( tsc->data[SC_CLOAKINGEXCEED] && !(st->mode&MD_BOSS) )
+					return 0;
+				if( (tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) || tsc->data[SC__INVISIBILITY] || tsc->data[SC_CAMOUFLAGE]) && !(st->mode&MD_BOSS) &&
+					( ((TBL_PC*)target)->special_state.perfect_hiding || !(st->mode&MD_DETECTOR) ) )
+					return 0;
+				break;
+			default:
+				if( (tsc->option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) || tsc->data[SC__INVISIBILITY] || tsc->data[SC_CAMOUFLAGE]) && !(st->mode&(MD_BOSS|MD_DETECTOR)) )
+					return 0;
+
+		}
 	}
 
 	return 1;
@@ -2054,12 +2059,13 @@ int status_calc_mob_(struct mob_data* md, enum e_status_calc_opt opt) {
 		mbl = map->id2bl(md->master_id);
 
 	if (flag&8 && mbl) {
-		struct status_data *mstatus = status->get_base_status(mbl);
-		if (mstatus &&
-			battle_config.slaves_inherit_speed&(mstatus->mode&MD_CANMOVE?1:2))
-			mstatus->speed = mstatus->speed;
-		if( mstatus->speed < 2 ) /* minimum for the unit to function properly */
-			mstatus->speed = 2;
+		struct status_data *mstatus;
+		if ( (mstatus = status->get_base_status(mbl)) ) {
+			if( battle_config.slaves_inherit_speed&(mstatus->mode&MD_CANMOVE?1:2) )
+				mstatus->speed = mstatus->speed;
+			if( mstatus->speed < 2 ) /* minimum for the unit to function properly */
+				mstatus->speed = 2;
+		}
 	}
 
 	if (flag&16 && mbl) {
@@ -9932,7 +9938,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
 	else if(opt_flag) {
 		clif->changeoption(bl);
 		if( sd && opt_flag&0x4 ) {
-			clif->changelook(bl,LOOK_BASE,vd->class_);
+			clif->changelook(bl,LOOK_BASE,sd->vd.class_);
 			clif->get_weapon_view(sd, &sd->vd.weapon, &sd->vd.shield);
 			clif->changelook(bl,LOOK_WEAPON,sd->vd.weapon);
 			clif->changelook(bl,LOOK_SHIELD,sd->vd.shield);