* Fixed AutospellWhenHit effect to only work on melee attacks

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1311 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
celest 2005-03-27 12:53:00 +00:00
parent 074610922d
commit 06661cb573
2 changed files with 3 additions and 1 deletions

View File

@ -1,6 +1,7 @@
Date Added Date Added
03/27 03/27
* Fixed AutospellWhenHit effect to only work on melee attacks [celest]
* Fixed AddEffWhenHit effect to only work on melee attacks [celest] * Fixed AddEffWhenHit effect to only work on melee attacks [celest]
* Moved guardian hostility checking and monster_ignore_gm check to battle.c -- * Moved guardian hostility checking and monster_ignore_gm check to battle.c --
processed earlier, and more appropiate [celest] processed earlier, and more appropiate [celest]

View File

@ -3616,7 +3616,8 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target,
} }
if (target->type == BL_PC) { if (target->type == BL_PC) {
struct map_session_data *tsd = (struct map_session_data *)target; struct map_session_data *tsd = (struct map_session_data *)target;
if(tsd->autospell2_id > 0 && rand()%100 < tsd->autospell2_rate) { if(tsd && ((sd && !sd->state.arrow_atk) || (status_get_range(src)<=2)) &&
tsd->autospell2_id > 0 && rand()%100 < tsd->autospell2_rate) {
int skilllv = tsd->autospell_lv,i,f=0,sp; int skilllv = tsd->autospell_lv,i,f=0,sp;
i = rand()%100; i = rand()%100;
if(i >= 50) skilllv -= 2; if(i >= 50) skilllv -= 2;