summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/map.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b4115916c..b45b43c7f 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,6 +6,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/07/28
* Kaahi heals no matter if attack connects. (bugreport:2440) [Inkfish]
* Fixed a typo causing skillitem always resets skill delay. (bugreport:3431) [Inkfish]
+ * Fixed damage_level is not calculated properly on normal attack. [Inkfish]
+ * Kaahi is supposed to be canceled on logout. [Inkfish]
09/07/25
* Rewrote Quest Log system. [Inkfish]
* Fixed message display for FullStrip and SelfProvoke. (bugreport: 3011, bugreport: 3415) [Inkfish]
diff --git a/src/map/battle.c b/src/map/battle.c
index 17073a447..478fdfbf0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3007,7 +3007,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
if(tsc && tsc->data[SC_KAAHI] && tsc->data[SC_KAAHI]->val4 == -1)
tsc->data[SC_KAAHI]->val4 = add_timer(tick + skill_get_time2(SL_KAAHI,tsc->data[SC_KAAHI]->val1), kaahi_heal_timer, target->id, SC_KAAHI); //Activate heal.
- wd = battle_calc_weapon_attack(src, target, 0, 0, flag);
+ wd = battle_calc_attack(BF_WEAPON, src, target, 0, 0, flag);
if (sd && sd->state.arrow_atk) //Consume arrow.
battle_consume_ammo(sd, 0, 0);
diff --git a/src/map/map.c b/src/map/map.c
index b1bf03126..bbff98410 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1578,6 +1578,8 @@ int map_quit(struct map_session_data *sd)
status_change_end(&sd->bl,SC_STEELBODY,-1);
if(sd->sc.data[SC_PRESERVE])
status_change_end(&sd->bl,SC_PRESERVE,-1);
+ if(sd->sc.data[SC_KAAHI])
+ status_change_end(&sd->bl,SC_KAAHI,-1);
}
}