summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5611c57f4..cb0b668b4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
09/07/04
* TK_POWER shouldn't count the player him/herself for the skill. [Inkfish]
+ * Fixed a wrong check of Intimidate on hp. (bugreport:3305)[Inkfish]
09/07/03
* Martyr's Reckoning can be perfect dodged. [Inkfish]
* Casting Flying Kick while running and in the spurt status doubles the damage dealt without spurt status. (bugreport:1898) [Inkfish]
diff --git a/src/map/skill.c b/src/map/skill.c
index 637253834..857c0c40f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1847,7 +1847,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
if(damage > 0 && dmg.flag&BF_SKILL && tsd
&& pc_checkskill(tsd,RG_PLAGIARISM)
&& (!sc || !sc->data[SC_PRESERVE])
- && damage < tsd->status.hp)
+ && damage < tsd->battle_status.hp)
{ //Updated to not be able to copy skills if the blow will kill you. [Skotlex]
if ((!tsd->status.skill[skillid].id || tsd->status.skill[skillid].flag >= 13) &&
can_copy(tsd,skillid,bl)) // Split all the check into their own function [Aru]