Removed unnecessary am-healing flag, incorporated healing packets with regular opt status flags. This, together with the clientdata update, should fix the stuck healing state.

1 files changed, 3 insertions, 14 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index d7f469d..d03b247 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5000,16 +5000,11 @@ 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;
 	sd->quick_regeneration_sp.amount = 0;
+        skill_update_heal_animation(sd);
 
 	pc_setdead(sd);
 
@@ -5480,10 +5475,6 @@ int pc_itemheal(struct map_session_data *sd,int hp,int sp)
                 pc_heal_quick_accumulate(hp,
                                          &sd->quick_regeneration_hp,
                                          sd->status.max_hp - sd->status.hp);
-		if (!sd->special_state.heal_effect)  {
-			sd->special_state.heal_effect = 1;
-			clif_status_change(&sd->bl, SC_HEALING, 1);
-		}
                 hp = 0;
         }
         if (sp > 0) {
@@ -7110,10 +7101,8 @@ static int pc_natural_heal_sub(struct map_session_data *sd,va_list ap) {
                 int sp_bonus = pc_quickregenerate_effect(&sd->quick_regeneration_sp, sd->nhealsp);
 
                 pc_itemheal_effect(sd, hp_bonus, sp_bonus);
-        } else if  (!sd->quick_regeneration_hp.amount && sd->special_state.heal_effect) {
-		sd->special_state.heal_effect = 0;
-		clif_status_change(&sd->bl, SC_HEALING, 0);
-	}
+        }
+        skill_update_heal_animation(sd); // if needed.
 
 // -- moonsoul (if conditions below altered to disallow natural healing if under berserk status)
 	if ((sd->sc_data[SC_FLYING_BACKPACK].timer != -1