diff options
| author | Haru <haru@dotalux.com> | 2019-04-07 23:10:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 23:10:55 +0200 |
| commit | ab975f47579e1522dd6da8996913ac31c2e72207 (patch) | |
| tree | 3954ed57ab46f4e403d83215822d6ca4a9e24189 /src/map/battle.c | |
| parent | 4c571d8382418024ef39640f231ced878919e58e (diff) | |
| parent | e610e222c57c1268fce72bc9578b42f655c18545 (diff) | |
| download | hercules-ab975f47579e1522dd6da8996913ac31c2e72207.tar.gz hercules-ab975f47579e1522dd6da8996913ac31c2e72207.tar.bz2 hercules-ab975f47579e1522dd6da8996913ac31c2e72207.tar.xz hercules-ab975f47579e1522dd6da8996913ac31c2e72207.zip | |
Merge pull request #2406 from 4144/updatepackets
Update packets and messages up to 2019-04-03
Diffstat (limited to 'src/map/battle.c')
| -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 798f50b13..fe7a64b51 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6361,7 +6361,7 @@ static enum damage_lv battle_weapon_attack(struct block_list *src, struct block_ if (d_bl != NULL && ((d_bl->type == BL_MER && d_md->master != NULL && d_md->master->bl.id == target->id) - || (d_bl->type == BL_PC && d_sd->devotion[sce->val2] == target->id) + || (d_sd != NULL && d_bl->type == BL_PC && d_sd->devotion[sce->val2] == target->id) ) && check_distance_bl(target, d_bl, sce->val3) ) { @@ -7415,6 +7415,8 @@ static const struct battle_data { { "display_fake_hp_when_dead", &battle_config.display_fake_hp_when_dead, 1, 0, 1, }, { "magicrod_type", &battle_config.magicrod_type, 0, 0, 1, }, { "features/enable_achievement_system", &battle_config.feature_enable_achievement, 1, 0, 1, }, + { "ping_timer_inverval", &battle_config.ping_timer_interval, 30, 0, 99999999, }, + { "ping_time", &battle_config.ping_time, 20, 0, 99999999, }, }; static bool battle_set_value_sub(int index, int value) |