summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-05 18:16:33 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-05 18:16:33 +0000
commitb6a4e310b0582097f61faf175a59a1056262f911 (patch)
tree736ad5437e284d0f92b97b9a80fba08c0d43cd98 /src/map/clif.c
parent75530b149dc1272d17c2c22faefe2e6c3e762c5b (diff)
downloadhercules-b6a4e310b0582097f61faf175a59a1056262f911.tar.gz
hercules-b6a4e310b0582097f61faf175a59a1056262f911.tar.bz2
hercules-b6a4e310b0582097f61faf175a59a1056262f911.tar.xz
hercules-b6a4e310b0582097f61faf175a59a1056262f911.zip
- Fixed a duplicate warp name in Rachel
- Fixed Venom Splasher not being Poison elemental - Cleaned up #blv - Fixed the skill tree not always updating when using @allskill - Probably fixed the target-change on melee attack setting not working. - Moved the deletion of the invincible timer when using skills so that it is not deleted for skills such as Ashura (when just selecting a target) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9791 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index fb9b345d5..8f4e625f1 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9702,8 +9702,6 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) {
if(sd->sc.option&(OPTION_WEDDING|OPTION_XMAS))
return;
- pc_delinvincibletimer(sd);
-
if(target_id<0 && -target_id == sd->bl.id) // for disguises [Valaris]
target_id = sd->bl.id;
@@ -9755,6 +9753,8 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) {
skilllv = tmp;
}
+ pc_delinvincibletimer(sd);
+
if (skilllv)
unit_skilluse_id(&sd->bl, target_id, skillnum, skilllv);