From 07cafd48663f25cf00939a8f97601ef298ceea45 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Tue, 3 Dec 2013 22:15:23 +0100 Subject: [PATCH] Fixed bug where disabling hardcore mode for specific skills didn't work Fixes #1661 --- Changelog.txt | 1 + src/main/java/com/gmail/nossr50/util/HardcoreManager.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Changelog.txt b/Changelog.txt index dde90dc6e..5e10d8721 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -22,6 +22,7 @@ Version 1.4.08-dev = Fixed bug where the Unbreaking enchantment was ignored when using "Super Breaker" or "Giga Drill Breaker" = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false = Fixed bug where cooldown donor perks were reducing more than expected + = Fixed bug where disabling hardcore mode for specific skills didn't work ! Updated localization files ! Changed AxesCritical to CriticalHit in config file ! Changed several secondary ability permissions(deprecated versions still exist) diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java index cd54020d3..601e1b52f 100644 --- a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java +++ b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java @@ -22,6 +22,10 @@ public final class HardcoreManager { int totalLevelsLost = 0; for (SkillType skillType : SkillType.NON_CHILD_SKILLS) { + if (!skillType.getHardcoreStatLossEnabled()) { + break; + } + int playerSkillLevel = playerProfile.getSkillLevel(skillType); int playerSkillXpLevel = playerProfile.getSkillXpLevel(skillType); @@ -54,6 +58,10 @@ public final class HardcoreManager { int totalLevelsStolen = 0; for (SkillType skillType : SkillType.NON_CHILD_SKILLS) { + if (!skillType.getHardcoreVampirismEnabled()) { + break; + } + int killerSkillLevel = killerProfile.getSkillLevel(skillType); int victimSkillLevel = victimProfile.getSkillLevel(skillType);