summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 71528dd27..64a892936 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,7 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2009/03/02
* Blade Stop status no longer prevents item use and equip changing.
- * Blade Stop skill will now only activate if the attacker is at most 2 cells away (1 if barehanded).
+ * Against non-players, Blade Stop skill will now only activate if the attacker is at most 2 cells away (1 if barehanded).
2009/03/01
* Fixes from 2008/10/13 bugreport:2077 (Only commiting because nobody did until now and those bugs would get lost)
* Fixed monster's Spiral Pierce, now it is always blocked by Pneuma.
diff --git a/src/map/battle.c b/src/map/battle.c
index 40f4ea4cd..6485a53e7 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2980,7 +2980,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
}
}
- if( tsc && tsc->data[SC_BLADESTOP_WAIT] && !is_boss(src) && distance_bl(src, target) <= (tsd->status.weapon == W_FIST ? 1 : 2) )
+ if( tsc && tsc->data[SC_BLADESTOP_WAIT] && !is_boss(src) && (src->type == BL_PC || distance_bl(src, target) <= (tsd->status.weapon == W_FIST ? 1 : 2)) )
{
int skilllv = tsc->data[SC_BLADESTOP_WAIT]->val1;
int duration = skill_get_time2(MO_BLADESTOP,skilllv);