From 9607a26f2b45b9ea2237bdf4a35c7e43a10c692a Mon Sep 17 00:00:00 2001 From: amber Date: Sun, 5 Dec 2004 17:17:37 +0000 Subject: [PATCH] Fix another crash git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@469 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog.txt | 2 ++ src/map/battle.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index b05aa2eddb..e5b0d3e550 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 df8b583cf6..a66ddb8707 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))