summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-08 12:25:59 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-08 12:25:59 +0000
commit5b24315ae353c051415fd878c4a2817c94b6a245 (patch)
treefb21d4e15cbd1fd99c0e9c8c6cd223de846bcc79 /src
parent5666e2aeec32ec097aec558738d837e8c5bb941f (diff)
downloadhercules-5b24315ae353c051415fd878c4a2817c94b6a245.tar.gz
hercules-5b24315ae353c051415fd878c4a2817c94b6a245.tar.bz2
hercules-5b24315ae353c051415fd878c4a2817c94b6a245.tar.xz
hercules-5b24315ae353c051415fd878c4a2817c94b6a245.zip
* Fixed kill steal protection result in skill casting (unit_skilluse_id2) not getting evaluated (bugreport:1808, since r12203).
- Moved kill steal protection in skill casting to be only executed, after the actual target has been determined and validated (since r12203). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14658 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/unit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index df4efef8e..3b3dd0e5f 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -939,8 +939,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
if(skillnotok(skill_num, sd)) // [MouseJstr]
return 0;
- mob_ksprotected(src, map_id2bl(target_id));
-
switch(skill_num)
{ //Check for skills that auto-select target
case MO_CHAINCOMBO:
@@ -987,6 +985,9 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
if( !target || src->m != target->m || !src->prev || !target->prev )
return 0;
+ if( mob_ksprotected(src, target) )
+ return 0;
+
//Normally not needed because clif.c checks for it, but the at/char/script commands don't! [Skotlex]
if(ud->skilltimer != -1 && skill_num != SA_CASTCANCEL)
return 0;