From 9c62eee5e8d75ed6636fdb942cb91769698118a5 Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Fri, 1 Nov 2019 13:23:41 -0500 Subject: [PATCH] Few tiny improvements. --- .../java/com/massivecraft/factions/event/PowerLossEvent.java | 4 ++-- .../java/com/massivecraft/factions/event/PowerRegenEvent.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/event/PowerLossEvent.java b/src/main/java/com/massivecraft/factions/event/PowerLossEvent.java index ccffe43c..893da8eb 100644 --- a/src/main/java/com/massivecraft/factions/event/PowerLossEvent.java +++ b/src/main/java/com/massivecraft/factions/event/PowerLossEvent.java @@ -74,13 +74,13 @@ public class PowerLossEvent extends FactionPlayerEvent implements Cancellable { * Gets the configured damage to a players individual power on death * @return power to be lost as a Double. */ - public Double getDefaultPowerLost() {return Conf.powerPerDeath;} + public double getDefaultPowerLost() {return Conf.powerPerDeath;} /** * Gets the variable power lost. Custom power ignored when less than or equal to zero. * @return custom power to be lost as a Double. */ - public Double getCustomPowerLost() {return this.modified;} + public double getCustomPowerLost() {return this.modified;} /** * Sets the variable power lost. Custom power ignored when less than or equal to zero. diff --git a/src/main/java/com/massivecraft/factions/event/PowerRegenEvent.java b/src/main/java/com/massivecraft/factions/event/PowerRegenEvent.java index f321c02c..d2e1f567 100644 --- a/src/main/java/com/massivecraft/factions/event/PowerRegenEvent.java +++ b/src/main/java/com/massivecraft/factions/event/PowerRegenEvent.java @@ -20,10 +20,10 @@ public class PowerRegenEvent extends FactionPlayerEvent implements Cancellable { } /** - * Get the amount of power this player will regen + * Get the amount of power this player will regen by default * @return power amount gained as a Double. */ - public Double getPowerGained() { + public double getDefaultPowerGained() { return fPlayer.getMillisPassed() * Conf.powerPerMinute / 60000; }