summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 16:39:58 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 16:39:58 +0000
commit812a49d677a9e208fc12d66d315a62a05f79d51b (patch)
treed0f0ec79d2fb0b75547fe57d433c291fa6bb60d1 /src/map/status.c
parentc2da0a3c7938b6461c3293b31d0e2f0db723f8d3 (diff)
downloadhercules-812a49d677a9e208fc12d66d315a62a05f79d51b.tar.gz
hercules-812a49d677a9e208fc12d66d315a62a05f79d51b.tar.bz2
hercules-812a49d677a9e208fc12d66d315a62a05f79d51b.tar.xz
hercules-812a49d677a9e208fc12d66d315a62a05f79d51b.zip
Fixed bugreport:6215 where using SR_CRESCENTELBOW can cause map server crashing when hit by 1HKO.
Fixed bugreport:6201 traps should now activate its splash damage properly. Follow up r16399 where Leech End ignoring Phen card's effect. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16416 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 1a591e8e5..cb8acd3e1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9708,7 +9708,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data)
if( --(sce->val4) >= 0 ) {
int damage = status->max_hp/100; // {Target VIT x (New Poison Research Skill Level - 3)} + (Target HP/100)
damage += status->vit * (sce->val1 - 3);
- unit_skillcastcancel(bl,0);
+ unit_skillcastcancel(bl,2);
map_freeblock_lock();
status_damage(bl, bl, damage, 0, clif_damage(bl,bl,tick,status_get_amotion(bl),status_get_dmotion(bl)+500,damage,1,0,0), 1);
if( sc->data[type] ) {