- Removed the ->prev != NULL checks in skill_attack due to the fact that the code should check elsewhere how it should behave (eg: if traps are not cleared on death, stepping on one afterwards SHOULD cause damage)

- Removed use of packet 0x1c9 for skill_unit display, except for Graffiti (which is the only unit which requires the much larger packet)
- clif_getareachar_skillunit will sent the unit_id of UNT_ATTACK_SKILLS for traps (this is to prevent them from displaying on the client)


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index ef702d03b..e7dd39134 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1695,8 +1695,8 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds
 	nullpo_retr(0, dsrc); //dsrc is the actual originator of the damage, can be the same as src, or a skill casted by src.

 	nullpo_retr(0, bl); //Target to be attacked.

 

-	if(src->prev == NULL || dsrc->prev == NULL || bl->prev == NULL)

-		return 0;

+//	if(src->prev == NULL || dsrc->prev == NULL || bl->prev == NULL)

+//		return 0;

 	if (src != dsrc) {

 		//When caster is not the src of attack, this is a ground skill, and as such, do the relevant target checking. [Skotlex]

 		if (!status_check_skilluse(battle_config.skill_caster_check?src:NULL, bl, skillid, 2))

@@ -2454,7 +2454,7 @@ static int skill_reveal_trap( struct block_list *bl,va_list ap )
 	TBL_SKILL *su = (TBL_SKILL*)bl;

 	if (su->alive && su->group && skill_get_inf2(su->group->skill_id)&INF2_TRAP)

 	{	//Reveal trap.

-		clif_reveal_skillunit(su);

+		clif_changetraplook(bl, su->group->unit_id);

 		return 1;

 	}

 	return 0;