From c1d7d16b0e4010b27591f37ee93a1ca8d1137ecb Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 19 Jun 2009 13:26:50 +0000 Subject: * Implemented script command "areamobuseskill" and skill NPC_INVINCIBLE and NPC_INVINCIBLEOFF. (topic:217330) * Using items no longer cancels invincibility(but using target and ground skills through items does). (bugreport:3259) * Fixed Butterfly Wings not working during GVG. (bugreport:3264) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13897 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index ddb0fcca8..7a16ab73b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8940,8 +8940,6 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd) } else if (pc_istrading(sd)) return; - - pc_delinvincibletimer(sd); //Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex] sd->idletime = last_tick; @@ -9510,6 +9508,8 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) { if( skilllv != sd->skillitemlv ) skilllv = sd->skillitemlv; + if( !(skill_get_inf(skillnum)&INF_SELF_SKILL) ) + pc_delinvincibletimer(sd); // Target skills thru items cancel invincibility. [Inkfish] unit_skilluse_id(&sd->bl, target_id, skillnum, skilllv); return; } -- cgit v1.2.3-60-g2f50