diff options
author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-31 17:26:12 +0000 |
---|---|---|
committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-31 17:26:12 +0000 |
commit | 9c43f344ffa5fa92d9fe2ed2114eee4394cabfb0 (patch) | |
tree | dac6c18ddc31796a37514bd7b9e193db5ced4100 /src | |
parent | 7381b62a0f67308ce0b482c7fc42d36a0f1a7160 (diff) | |
download | hercules-9c43f344ffa5fa92d9fe2ed2114eee4394cabfb0.tar.gz hercules-9c43f344ffa5fa92d9fe2ed2114eee4394cabfb0.tar.bz2 hercules-9c43f344ffa5fa92d9fe2ed2114eee4394cabfb0.tar.xz hercules-9c43f344ffa5fa92d9fe2ed2114eee4394cabfb0.zip |
Fixed Wink of Charm, affected mobs will now follow caster during effect, bugreport:3127
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15336 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/skill.c | 2 | ||||
-rw-r--r-- | src/map/status.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 5ce391755..0e94d1cc4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5085,7 +5085,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if( status_get_lv(src) > status_get_lv(bl) && (tstatus->race == RC_DEMON || tstatus->race == RC_DEMIHUMAN || tstatus->race == RC_ANGEL) && !(tstatus->mode&MD_BOSS) ) - clif_skill_nodamage(src,bl,skillid,skilllv, sc_start(bl,type,70,skilllv,skill_get_time(skillid,skilllv))); + clif_skill_nodamage(src,bl,skillid,skilllv, sc_start2(bl,type,70,skilllv,src->id,skill_get_time(skillid,skilllv))); else { clif_skill_nodamage(src,bl,skillid,skilllv,0); diff --git a/src/map/status.c b/src/map/status.c index 40e083595..9a70ae470 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1344,8 +1344,9 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int ) return 0; - if (sc->data[SC_WINKCHARM] && target && !flag) - { //Prevents skill usage + if (sc->data[SC_WINKCHARM] && target && !flag) { //Prevents skill usage + if( unit_bl2ud(src) && (unit_bl2ud(src))->walktimer == INVALID_TIMER ) + unit_walktobl(src, map_id2bl(sc->data[SC_WINKCHARM]->val2), 3, 1); clif_emotion(src, E_LV); return 0; } |