summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-08-25 19:37:22 +0200
committerHaru <haru@dotalux.com>2019-08-26 01:22:08 +0200
commit310b7dd9b8d2e862657d84cc72bb156e0d2ad226 (patch)
tree7c86b960608c6a8209d73fc8a25e7108c896059f /src/map/pc.c
parent7c25f7ea7c575cfdb025a688a635b89ef5fae1c1 (diff)
downloadhercules-310b7dd9b8d2e862657d84cc72bb156e0d2ad226.tar.gz
hercules-310b7dd9b8d2e862657d84cc72bb156e0d2ad226.tar.bz2
hercules-310b7dd9b8d2e862657d84cc72bb156e0d2ad226.tar.xz
hercules-310b7dd9b8d2e862657d84cc72bb156e0d2ad226.zip
Fix an issue that prevents homunculus auto-vaporize on death or skill reset
The >80% HP condition is now ignored in the cases the vaporization is forced by the server Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 1e7ac5817..b0c77049c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7765,7 +7765,7 @@ static int pc_resetskill(struct map_session_data *sd, int flag)
pc->setoption(sd, i);
if( homun_alive(sd->hd) && pc->checkskill(sd, AM_CALLHOMUN) )
- homun->vaporize(sd, HOM_ST_REST);
+ homun->vaporize(sd, HOM_ST_REST, true);
if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
@@ -8054,7 +8054,7 @@ static int pc_dead(struct map_session_data *sd, struct block_list *src)
if (sd->status.hom_id > 0){
if(battle_config.homunculus_auto_vapor && sd->hd)
- homun->vaporize(sd, HOM_ST_REST);
+ homun->vaporize(sd, HOM_ST_REST, true);
}
if( sd->md )
@@ -9069,7 +9069,7 @@ static int pc_jobchange(struct map_session_data *sd, int class, int upper)
pc->setoption(sd, i);
if(homun_alive(sd->hd) && !pc->checkskill(sd, AM_CALLHOMUN))
- homun->vaporize(sd, HOM_ST_REST);
+ homun->vaporize(sd, HOM_ST_REST, true);
if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);