diff options
| author | Fate <fate-tmw@googlemail.com> | 2009-05-24 13:03:59 +0000 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2009-05-24 13:03:59 +0000 |
| commit | 75584894a3459149bb92213b9282a101dbb4b879 (patch) | |
| tree | 34963f86ac2b1d42b14631b2e0c74e98e30facac | |
| parent | 12560ec2f654339cfd6f219b2c0403ff683be19d (diff) | |
| parent | dd0631d545b4b3e13a6cecbd287a8d91b75524c2 (diff) | |
| download | tmwa-75584894a3459149bb92213b9282a101dbb4b879.tar.gz tmwa-75584894a3459149bb92213b9282a101dbb4b879.tar.bz2 tmwa-75584894a3459149bb92213b9282a101dbb4b879.tar.xz tmwa-75584894a3459149bb92213b9282a101dbb4b879.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena/mainline
| -rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 64e66d7..84dc028 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5000,6 +5000,12 @@ int pc_damage(struct block_list *src,struct map_session_data *sd,int damage) // Character is dead! + // [Kage] Make sure the healing effect doesn't play + if (sd->special_state.heal_effect) { + sd->special_state.heal_effect = 0; + clif_status_change(&sd->bl, SC_HEALING, 0); + } + sd->status.hp = 0; // [Fate] Stop quickregen sd->quick_regeneration_hp.amount = 0; |