From 4c7166251f48f3e096b41c564cf02075fdf15de3 Mon Sep 17 00:00:00 2001 From: graywolf336 Date: Wed, 10 Jun 2015 16:05:24 -0500 Subject: [PATCH] Add isJailedForever to the prisoner & use it in pay --- src/main/java/com/graywolf336/jail/beans/Prisoner.java | 7 ++++++- .../jail/command/subcommands/JailPayCommand.java | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/graywolf336/jail/beans/Prisoner.java b/src/main/java/com/graywolf336/jail/beans/Prisoner.java index f6118b8..d44a714 100644 --- a/src/main/java/com/graywolf336/jail/beans/Prisoner.java +++ b/src/main/java/com/graywolf336/jail/beans/Prisoner.java @@ -15,7 +15,7 @@ import com.graywolf336.jail.enums.Lang; * * @author graywolf336 * @since 2.x.x - * @version 3.1.0 + * @version 3.1.1 */ public class Prisoner { private String uuid, name, jailer, reason, inventory, armor; @@ -226,6 +226,11 @@ public class Prisoner { this.muted = muted; this.changed = true; } + + /** Gets whether the prisoner is jailed forever or not. */ + public boolean isJailedForever() { + return this.time == -1; + } /** Gets the remaining time the prisoner has. */ public long getRemainingTime() { diff --git a/src/main/java/com/graywolf336/jail/command/subcommands/JailPayCommand.java b/src/main/java/com/graywolf336/jail/command/subcommands/JailPayCommand.java index 9463ae6..91509de 100644 --- a/src/main/java/com/graywolf336/jail/command/subcommands/JailPayCommand.java +++ b/src/main/java/com/graywolf336/jail/command/subcommands/JailPayCommand.java @@ -139,13 +139,13 @@ public class JailPayCommand implements Command { if(jm.isPlayerJailedByLastKnownUsername(args[2])) { Prisoner p = jm.getPrisonerByLastKnownName(args[2]); - if(p.getRemainingTime() > 0) { - if(!pm.isTimedEnabled()) { + if(p.isJailedForever()) { + if(!pm.isInfiniteEnabled()) { sender.sendMessage(Lang.PAYNOTENABLED.get()); return true; } }else { - if(!pm.isInfiniteEnabled()) { + if(!pm.isTimedEnabled()) { sender.sendMessage(Lang.PAYNOTENABLED.get()); return true; }