diff options
| author | shennetsind <ind@henn.et> | 2013-07-26 09:59:30 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-26 09:59:30 -0300 |
| commit | b23563de5f9abde73600f84aff1d24d9f3b53bc5 (patch) | |
| tree | 21ed35a07c74c224957b888b12e387cdd3751561 /src/map/skill.c | |
| parent | 583272234fc96da7911029cd3cad13a7fb386e9e (diff) | |
| parent | e9e8914ebfa70c1c212d0a7d7173b6da9e0e5b60 (diff) | |
| download | hercules-b23563de5f9abde73600f84aff1d24d9f3b53bc5.tar.gz hercules-b23563de5f9abde73600f84aff1d24d9f3b53bc5.tar.bz2 hercules-b23563de5f9abde73600f84aff1d24d9f3b53bc5.tar.xz hercules-b23563de5f9abde73600f84aff1d24d9f3b53bc5.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 835d5cca9..9ef768382 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -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; } |