diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 17:17:37 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-05 17:17:37 +0000 |
| commit | 0a2c2cb36b954616baa186fa79fa592deb77fd93 (patch) | |
| tree | fb9e0625ef9e3b46dade429efd54393e9a8b45f5 | |
| parent | e4e674473518ab7e513639f19963174b7697dade (diff) | |
| download | hercules-0a2c2cb36b954616baa186fa79fa592deb77fd93.tar.gz hercules-0a2c2cb36b954616baa186fa79fa592deb77fd93.tar.bz2 hercules-0a2c2cb36b954616baa186fa79fa592deb77fd93.tar.xz hercules-0a2c2cb36b954616baa186fa79fa592deb77fd93.zip | |
Fix another crash
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@469 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index b05aa2edd..e5b0d3e55 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 12/5 + * Fixed the range_check again to stop it from crashing + servers [MouseJstr] * removed stubbed out unfinished atcommands as per Cameri [MouseJstr] * Fixed nullpo's for gcc 2.95 [MouseJstr] * Fixed bug in which login-txt was crashing in do_final() due to some free's [MC Cameri] diff --git a/src/map/battle.c b/src/map/battle.c index df8b583cf..a66ddb870 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4962,7 +4962,7 @@ int battle_check_range(struct block_list *src,struct block_list *bl,int range) if( range>0 && range < arange ) {// ‰“‚·‚¬‚é // be lenient if the skill was cast before we have moved to the correct position [Celest] - if (src->type == BL_PC) { + if (src->type == BL_PC && bl->type == BL_PC) { struct map_session_data *sd; nullpo_retr(0, (sd=(struct map_session_data *)bl)); if (sd->walktimer != -1 && !((arange-=battle_config.skill_range_leniency)<=range)) |