summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 91ae9eb06..42695e1b4 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -834,11 +834,13 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag)
) //End auto berserk.
status_change_end(bl,SC_PROVOKE,-1);
+ // send hp update to client
switch(bl->type) {
case BL_PC: pc_heal((TBL_PC*)bl,hp,sp,flag&2?1:0); break;
case BL_MOB: mob_heal((TBL_MOB*)bl,hp); break;
case BL_HOM: merc_hom_heal((TBL_HOM*)bl,hp,sp); break;
}
+
return hp+sp;
}
@@ -1446,10 +1448,7 @@ int status_calc_mob(struct mob_data* md, int first)
else {
status->max_hp += 2000 * gc->defense;
status->max_sp += 200 * gc->defense;
- if (md->guardian_data->number < MAX_GUARDIANS) //Spawn with saved HP
- status->hp = gc->guardian[md->guardian_data->number].hp;
- else //Emperium
- status->hp = status->max_hp;
+ status->hp = status->max_hp;
status->sp = status->max_sp;
}
status->batk += status->batk * 10*md->guardian_data->guardup_lv/100;