diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-29 09:44:17 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-29 09:44:17 +0000 |
| commit | 131a6f555562e56dfb180b310d4c893a993e7b15 (patch) | |
| tree | bb671bfb98d30518ebd484920e56744c7a4de636 | |
| parent | 8737459f9c85d2462fabcf64c157354ad87b2836 (diff) | |
| download | hercules-131a6f555562e56dfb180b310d4c893a993e7b15.tar.gz hercules-131a6f555562e56dfb180b310d4c893a993e7b15.tar.bz2 hercules-131a6f555562e56dfb180b310d4c893a993e7b15.tar.xz hercules-131a6f555562e56dfb180b310d4c893a993e7b15.zip | |
Fixed bugreport:6359
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16529 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -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 00b04dc0c..e1d34d7e0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -351,7 +351,7 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag status_change_end(target, SC_CRYSTALIZE, INVALID_TIMER); } } - if( src->type == BL_PC ){ + if( src && src->type == BL_PC ){ struct map_session_data *sd = BL_CAST(BL_PC, src); int s; @@ -360,7 +360,7 @@ int battle_attr_fix(struct block_list *src, struct block_list *target, int damag if( s < 5 && atk_elem == s ) ratio += sd->talisman[s] * 2; // +2% custom value } - if( target->type == BL_PC ) { + if( target && target->type == BL_PC ) { struct map_session_data *tsd = BL_CAST(BL_PC, target); int t; |