diff --git a/CHANGELOG b/CHANGELOG index b40606246..2e031c0e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -71,3 +71,4 @@ - Spending points to cancel your slayer task no longer sets your task streak to 0. - Stars now have bots that will spawn and help mine for stars higher than level 5. - Barrows equipment now lasts for 15 hours of combat instead of 40 minutes of combat. +- Fix granting hp xp on controlled diff --git a/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt index 80f8bbcd1..361f3e739 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt @@ -410,6 +410,10 @@ abstract class CombatSwingHandler(var type: CombatStyle?) { } if (state != null) { val hit = state.totalDamage + if (entity is Player) { + player.skills.addExperience(Skills.HITPOINTS, hit * 1.33, true) + } + var skill = -1 when (attStyle) { WeaponInterface.STYLE_DEFENSIVE -> skill = Skills.DEFENCE @@ -441,7 +445,6 @@ abstract class CombatSwingHandler(var type: CombatStyle?) { } if (skill < 0) return player.skills.addExperience(skill, hit * EXPERIENCE_MOD, true) - player.skills.addExperience(Skills.HITPOINTS, hit * 1.33, true) } }