diff options
| author | shennetsind <ind@henn.et> | 2013-12-02 13:18:25 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-12-02 13:18:25 -0200 |
| commit | e46ca28bddd673f8217456297f596e0fe3c67609 (patch) | |
| tree | 10250271418ebf4f56bc100fd973c53c4a166ce1 /src | |
| parent | e115c30bde414fc82a617645c7fadeabd04cf56f (diff) | |
| download | hercules-e46ca28bddd673f8217456297f596e0fe3c67609.tar.gz hercules-e46ca28bddd673f8217456297f596e0fe3c67609.tar.bz2 hercules-e46ca28bddd673f8217456297f596e0fe3c67609.tar.xz hercules-e46ca28bddd673f8217456297f596e0fe3c67609.zip | |
Fixed Bug 7336 (woo %2)
flag was discarding elegible guild mates.
Special Thanks to kyeme.
http://hercules.ws/board/tracker/issue-7336-gvg-noparty-is-missing/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index d65bb910f..38b516bd9 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6066,9 +6066,11 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f } if( flag&(BCT_PARTY|BCT_ENEMY) ) { int s_party = status->get_party_id(s_bl); + int s_guild = status->get_guild_id(s_bl); + if( s_party && s_party == status->get_party_id(t_bl) && !(map->list[m].flag.pvp && map->list[m].flag.pvp_noparty) - && !(map_flag_gvg(m) && map->list[m].flag.gvg_noparty) + && !(map_flag_gvg(m) && map->list[m].flag.gvg_noparty && !( s_guild && s_guild == status->get_guild_id(t_bl) )) && (!map->list[m].flag.battleground || sbg_id == tbg_id) ) state |= BCT_PARTY; else |