diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-10-15 12:29:02 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-10-15 12:29:02 +0800 |
| commit | 0fb501bc9813107e96cf75d36cc84380eaa272a3 (patch) | |
| tree | 2d98431864fca0a0268efd1ac301aff41a2fe39c /src/map/skill.c | |
| parent | edf504a9be5df413b4822f72a844d80499e0eb12 (diff) | |
| download | hercules-0fb501bc9813107e96cf75d36cc84380eaa272a3.tar.gz hercules-0fb501bc9813107e96cf75d36cc84380eaa272a3.tar.bz2 hercules-0fb501bc9813107e96cf75d36cc84380eaa272a3.tar.xz hercules-0fb501bc9813107e96cf75d36cc84380eaa272a3.zip | |
Follow up @ a4802eaef9d71283070f1f31c859da871a7c8d32
-skill animation.
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 70e946119..55c9b8eea 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6570,7 +6570,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui break; case SA_DISPELL: if (flag&1 || (i = skill->get_splash(skill_id, skill_lv)) < 1) - { + { + if( sd && dstsd && !map_flag_vs(sd->bl.m) + && (sd->status.party_id == 0 || sd->status.party_id != dstsd->status.party_id) ) { + // Outside PvP it should only affect party members and no skill fail message. + break; + } clif->skill_nodamage(src,bl,skill_id,skill_lv,1); if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER) || (tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_ROGUE) //Rogue's spirit defends againt dispel. @@ -6582,14 +6587,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui } if(status->isimmune(bl) || !tsc || !tsc->count) break; - - if( sd && dstsd && !map_flag_vs(sd->bl.m) - && (sd->status.party_id == 0 || sd->status.party_id != dstsd->status.party_id) ) { - // Outside PvP it should only affect party members - clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0); - break; - } - for(i = 0; i < SC_MAX; i++) { if ( !tsc->data[i] ) continue; |