diff options
| author | shennetsind <ind@henn.et> | 2013-06-09 00:25:31 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-09 00:25:31 -0300 |
| commit | 81caf701723222ad07168017959d815fdd34535b (patch) | |
| tree | 952c057ebcff99f0aacb6677c27f28cb4263895d /src/map/battle.c | |
| parent | e33322f82010fbd3a588147141e74496c15e18ae (diff) | |
| download | hercules-81caf701723222ad07168017959d815fdd34535b.tar.gz hercules-81caf701723222ad07168017959d815fdd34535b.tar.bz2 hercules-81caf701723222ad07168017959d815fdd34535b.tar.xz hercules-81caf701723222ad07168017959d815fdd34535b.zip | |
Fixed Bug #7308
Special Thanks to kyeme, mkbu95!
http://hercules.ws/board/tracker/issue-7308-guild-aura-on-ally/
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 2cc4f984f..a2cc7692c 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5476,7 +5476,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { int s_guild = status_get_guild_id(s_bl); int t_guild = status_get_guild_id(t_bl); - if( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && s_guild && t_guild && (s_guild == t_guild || guild->isallied(s_guild, t_guild)) && (!map[m].flag.battleground || sbg_id == tbg_id) ) + if( !(map[m].flag.pvp && map[m].flag.pvp_noguild) && s_guild && t_guild && (s_guild == t_guild || (!(flag&BCT_SAMEGUILD) && guild->isallied(s_guild, t_guild))) && (!map[m].flag.battleground || sbg_id == tbg_id) ) state |= BCT_GUILD; else state |= BCT_ENEMY; @@ -5509,7 +5509,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f { int s_guild = status_get_guild_id(s_bl); int t_guild = status_get_guild_id(t_bl); - if(s_guild && t_guild && (s_guild == t_guild || guild->isallied(s_guild, t_guild))) + if(s_guild && t_guild && (s_guild == t_guild || (!(flag&BCT_SAMEGUILD) && guild->isallied(s_guild, t_guild)))) state |= BCT_GUILD; } } //end non pvp/gvg chk rivality |