Skip to content

Commit

Permalink
Fixed SA_DISPELL failing outside PvP against party
Browse files Browse the repository at this point in the history
- Follow-up to a4802ea
- Fixes bugreport #7572
  http://hercules.ws/board/tracker/issue-7572-dispell-2
- SA_DISPELL would fail outside PvP if caster and target are in the same
  party AND in the same guild at the same time.
- Special thanks for kyeme (bugreport), Xgear (review.)

Signed-off-by: Haru <haru@dotalux.com>
  • Loading branch information
MishimaHaruna committed Jul 24, 2013
1 parent 356a3ab commit 078bbba
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/map/skill.c
Original file line number Diff line number Diff line change
Expand Up @@ -6634,7 +6634,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
if(iStatus->isimmune(bl) || !tsc || !tsc->count)
break;

if( sd && dstsd && !map_flag_vs(sd->bl.m) && sd->status.guild_id == dstsd->status.guild_id ) {
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;
}
Expand Down

0 comments on commit 078bbba

Please sign in to comment.