diff options
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 9f7a56551..05c7bc89c 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2194,7 +2194,7 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s sp = tsd->status.max_sp * 10 * skilllv / 100; if (sp > tsd->status.sp) sp = tsd->status.sp; tsd->status.sp -= sp; - pc_heal(tsd,0,-sp); + clif_updatestatus(tsd,SP_SP); } break; case NPC_DARKBREATH: @@ -2269,11 +2269,20 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s } break; case MO_COMBOFINISH: /* җ */ - case CH_TIGERFIST: /* Ռ */ case CH_CHAINCRUSH: /* A? */ case CH_PALMSTRIKE: /* ҌՍdhR */ skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); break; + + case CH_TIGERFIST: /* Ռ */ + if (bl->type == BL_PC && !(map[bl->m].flag.gvg || map[bl->m].flag.pvp)) { + map_freeblock_unlock(); + return 1; + } + skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag); + break; + + case MO_EXTREMITYFIST: /* CeP */ { struct status_change *sc_data = status_get_sc_data(src); |