summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-04 22:18:34 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-03-04 22:18:34 +0000
commit8335fed5747108c69a9bb210a500c39107fb3cc2 (patch)
tree76e5184e83812dff223289aabeb23d3f889267e9 /src
parent647998c0b4bda1600c59323a4370be252701bc15 (diff)
downloadhercules-8335fed5747108c69a9bb210a500c39107fb3cc2.tar.gz
hercules-8335fed5747108c69a9bb210a500c39107fb3cc2.tar.bz2
hercules-8335fed5747108c69a9bb210a500c39107fb3cc2.tar.xz
hercules-8335fed5747108c69a9bb210a500c39107fb3cc2.zip
Fixed a crash if for some reason a mob uses Blade Stop.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13567 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index b8fec30cb..66a70e8a7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2976,7 +2976,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
}
}
- if( tsc && tsc->data[SC_BLADESTOP_WAIT] && !is_boss(src) && (src->type == BL_PC || distance_bl(src, target) <= (tsd->status.weapon == W_FIST ? 1 : 2)) )
+ if( tsc && tsc->data[SC_BLADESTOP_WAIT] && !is_boss(src) && (src->type == BL_PC || tsd == NULL || distance_bl(src, target) <= (tsd->status.weapon == W_FIST ? 1 : 2)) )
{
int skilllv = tsc->data[SC_BLADESTOP_WAIT]->val1;
int duration = skill_get_time2(MO_BLADESTOP,skilllv);