diff options
author | Andrei Karas <akaras@inbox.ru> | 2019-03-21 07:12:32 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2019-04-07 22:38:34 +0300 |
commit | 072b831c2cf88f3161c0a0c2e4742d8f30f9701a (patch) | |
tree | 281d88fe62b8fb0bf06001e030907896710a36c8 /src/map/battle.c | |
parent | fb6ae9943cdad5088d5bb0a1350bcef9ea36bcd1 (diff) | |
download | hercules-072b831c2cf88f3161c0a0c2e4742d8f30f9701a.tar.gz hercules-072b831c2cf88f3161c0a0c2e4742d8f30f9701a.tar.bz2 hercules-072b831c2cf88f3161c0a0c2e4742d8f30f9701a.tar.xz hercules-072b831c2cf88f3161c0a0c2e4742d8f30f9701a.zip |
Fix possible null pointers
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 798f50b13..c65b32132 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) ) { |