From 06661cb5732517b9be63d523012279b24c1dab76 Mon Sep 17 00:00:00 2001 From: celest Date: Sun, 27 Mar 2005 12:53:00 +0000 Subject: [PATCH] * 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 --- Changelog-SVN.txt | 1 + src/map/battle.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 2ed5abb17b..7f7763c37e 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -1,6 +1,7 @@ Date Added 03/27 + * Fixed AutospellWhenHit 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 -- processed earlier, and more appropiate [celest] diff --git a/src/map/battle.c b/src/map/battle.c index 9e8f6b578a..25aae5ec0b 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3616,7 +3616,8 @@ int battle_weapon_attack( struct block_list *src,struct block_list *target, } if (target->type == BL_PC) { 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; i = rand()%100; if(i >= 50) skilllv -= 2;