diff options
| author | Dastgir <dastgirp@gmail.com> | 2017-06-06 16:03:14 +0530 |
|---|---|---|
| committer | Dastgir <dastgirp@gmail.com> | 2017-06-06 16:03:14 +0530 |
| commit | 479cd8424c96d4754881df7a3ff6384e419f4c71 (patch) | |
| tree | d7fffe5de6ea804c236a5918b00d5b1f91d4948a /src/map/skill.c | |
| parent | 2f2fe7faf7456edb7e39c2c887d1dc7d2ba3b577 (diff) | |
| download | hercules-479cd8424c96d4754881df7a3ff6384e419f4c71.tar.gz hercules-479cd8424c96d4754881df7a3ff6384e419f4c71.tar.bz2 hercules-479cd8424c96d4754881df7a3ff6384e419f4c71.tar.xz hercules-479cd8424c96d4754881df7a3ff6384e419f4c71.zip | |
Fixed assert report when arrow shower(skill) was used on traps.
Fixes #1676
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index b70ddc055..381292f2f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -12156,7 +12156,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 struct skill_unit_group *sg; struct block_list *ss; struct map_session_data *tsd; - struct status_data *tstatus, *bst; + struct status_data *tstatus; struct status_change *tsc, *ssc; struct skill_unit_group_tickset *ts; enum sc_type type; @@ -12181,8 +12181,6 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 tstatus = status->get_status_data(bl); nullpo_ret(tstatus); - bst = status->get_base_status(bl); - nullpo_ret(bst); type = status->skill2sc(sg->skill_id); skill_id = sg->skill_id; @@ -12858,6 +12856,8 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6 if (tsc && (tsc->data[SC_HALLUCINATIONWALK] || tsc->data[SC_VACUUM_EXTREME])) { return 0; } else { + struct status_data *bst = status->get_base_status(bl); + nullpo_ret(bst); sg->limit -= 1000 * bst->str/20; sc_start(ss, bl, SC_VACUUM_EXTREME, 100, sg->skill_lv, sg->limit); |