From a22b5b18c39310bf4e787deac844005cf91ce836 Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 31 Dec 2021 21:45:20 -0600 Subject: [PATCH] Fix removal of xp multiplier enforcements --- .../node/entity/player/info/login/PlayerSaveParser.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt index 06c928bb8..0408a7dee 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt @@ -388,6 +388,14 @@ class PlayerSaveParser(val player: Player) { player.skills.parse(skillData) player.skills.experienceGained = saveFile!!["totalEXP"].toString().toDouble() player.skills.experienceMutiplier = saveFile!!["exp_multiplier"].toString().toDouble() + if (World.settings?.default_xp_rate != 5.0) { + player.skills.experienceMutiplier = World.settings?.default_xp_rate!! + } + val divisor: Double + if(player.skills.experienceMutiplier >= 10 && !player.attributes.containsKey("permadeath")){ //exclude permadeath HCIMs from XP squish + divisor = player.skills.experienceMutiplier / 5.0 + player.skills.correct(divisor) + } if (saveFile!!.containsKey("milestone")) { val milestone: JSONObject = saveFile!!["milestone"] as JSONObject player.skills.combatMilestone = (milestone.get("combatMilestone")).toString().toInt()