diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index ef437ab62..00c6f3ef0 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -124,7 +124,10 @@ public class PlayerListener implements Listener { */ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerDeathMonitor(PlayerDeathEvent event) { - if (!HardcoreManager.getHardcoreStatLossEnabled() && !HardcoreManager.getHardcoreVampirismEnabled()) { + boolean statLossEnabled = HardcoreManager.isStatLossEnabled(); + boolean vampirismEnabled = HardcoreManager.isVampirismEnabled(); + + if (!statLossEnabled && !vampirismEnabled) { return; } @@ -136,11 +139,11 @@ public class PlayerListener implements Listener { Player killer = killedPlayer.getKiller(); - if (killer != null && HardcoreManager.getHardcoreVampirismEnabled()) { + if (killer != null && vampirismEnabled) { HardcoreManager.invokeVampirism(killer, killedPlayer); } - if (HardcoreManager.getHardcoreStatLossEnabled()) { + if (statLossEnabled) { HardcoreManager.invokeStatPenalty(killedPlayer); } } diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java index 258df3c49..6c70a5951 100644 --- a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java +++ b/src/main/java/com/gmail/nossr50/util/HardcoreManager.java @@ -94,7 +94,7 @@ public final class HardcoreManager { * * @return true if Stat Loss is enabled for one or more skill types */ - public static boolean getHardcoreStatLossEnabled() { + public static boolean isStatLossEnabled() { boolean enabled = false; for (SkillType skillType : SkillType.nonChildSkills()) { @@ -112,7 +112,7 @@ public final class HardcoreManager { * * @return true if Vampirism is enabled for one or more skill types */ - public static boolean getHardcoreVampirismEnabled() { + public static boolean isVampirismEnabled() { boolean enabled = false; for (SkillType skillType : SkillType.nonChildSkills()) { diff --git a/src/main/java/com/gmail/nossr50/util/Motd.java b/src/main/java/com/gmail/nossr50/util/Motd.java index 7b9c72f89..8e2f602af 100644 --- a/src/main/java/com/gmail/nossr50/util/Motd.java +++ b/src/main/java/com/gmail/nossr50/util/Motd.java @@ -43,8 +43,8 @@ public final class Motd { * @param player Target player */ public static void displayHardcoreSettings(Player player) { - boolean deathStatLossEnabled = HardcoreManager.getHardcoreStatLossEnabled(); - boolean vampirismEnabled = HardcoreManager.getHardcoreVampirismEnabled(); + boolean deathStatLossEnabled = HardcoreManager.isStatLossEnabled(); + boolean vampirismEnabled = HardcoreManager.isVampirismEnabled(); if (!deathStatLossEnabled && !vampirismEnabled) { return;