diff options
| author | Haru <haru@dotalux.com> | 2018-02-10 03:09:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 03:09:33 +0100 |
| commit | c653d967508c194133d64e0c28fcc3dc0665cd77 (patch) | |
| tree | b4297f68017af291c2def0d27bd01eb87a7b09c7 /src/map/battle.c | |
| parent | 6f85e399942facc69555d078c82588f95b198711 (diff) | |
| parent | 40cdf84bb3ab0801ff1e000eeab6adf87cb7ac50 (diff) | |
| download | hercules-c653d967508c194133d64e0c28fcc3dc0665cd77.tar.gz hercules-c653d967508c194133d64e0c28fcc3dc0665cd77.tar.bz2 hercules-c653d967508c194133d64e0c28fcc3dc0665cd77.tar.xz hercules-c653d967508c194133d64e0c28fcc3dc0665cd77.zip | |
Merge pull request #1964 from MishimaHaruna/clanfix
Clanfix
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 d52d20f24..bd7e31d05 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6799,7 +6799,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f } else if (!(map->list[m].flag.pvp && map->list[m].flag.pvp_noparty) && (!map->list[m].flag.battleground || sbg_id == tbg_id)) { state |= BCT_PARTY; - } else if (!map->list[m].flag.cvc || s_clan == t_clan) { + } else if (!map->list[m].flag.cvc || s_clan == t_clan) { state |= BCT_PARTY; } else { state |= BCT_ENEMY; @@ -7309,7 +7309,7 @@ static const struct battle_data { { "max_body_style", &battle_config.max_body_style, 4, 0, SHRT_MAX, }, { "save_body_style", &battle_config.save_body_style, 0, 0, 1, }, { "player_warp_keep_direction", &battle_config.player_warp_keep_direction, 0, 0, 1, }, - { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, }, + { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, }, { "bow_unequip_arrow", &battle_config.bow_unequip_arrow, 1, 0, 1, }, { "max_summoner_parameter", &battle_config.max_summoner_parameter, 120, 10, 10000, }, { "mvp_exp_reward_message", &battle_config.mvp_exp_reward_message, 0, 0, 1, }, |