Fixed bugreport:5515 targets in manhole may now be targeted by shadow form.

Also fixed manhole appearance changing to a trap when activated.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15813 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/map/battle.c

@@ -4356,7 +4356,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 	switch( target->type )
 	{ // Checks on actual target
 		case BL_PC:
-			if (((TBL_PC*)target)->invincible_timer != INVALID_TIMER || pc_isinvisible((TBL_PC*)target) || ((TBL_PC*)target)->sc.data[SC__MANHOLE])
+			if (((TBL_PC*)target)->invincible_timer != INVALID_TIMER || pc_isinvisible((TBL_PC*)target))
 				return -1; //Cannot be targeted yet.
 			break;
 		case BL_MOB:

src/map/skill.c

@@ -10231,15 +10231,15 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 					sg->val2 = bl->id;
 				} else
 					sec = 3000; //Couldn't trap it?
-				clif_skillunit_update(&src->bl);
-
-				/**
-				 * If you're snared from a trap that was invisible this makes the trap be
-				 * visible again -- being you stepped on it (w/o this the trap remains invisible and you go "WTF WHY I CANT MOVE")
-				 * bugreport:3961
-				 **/
-				clif_changetraplook(&src->bl, UNT_ANKLESNARE);
-
+				if( sg->unit_id == UNT_ANKLESNARE ) {
+					clif_skillunit_update(&src->bl);
+					/**
+					 * If you're snared from a trap that was invisible this makes the trap be
+					 * visible again -- being you stepped on it (w/o this the trap remains invisible and you go "WTF WHY I CANT MOVE")
+					 * bugreport:3961
+					 **/
+					clif_changetraplook(&src->bl, UNT_ANKLESNARE);
+				}
 				sg->limit = DIFF_TICK(tick,sg->tick)+sec;
 				sg->interval = -1;
 				src->range = 0;