From 561c192c2775c3c5336a7b188e2c7103a775087d Mon Sep 17 00:00:00 2001 From: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Sun, 21 Mar 2021 12:21:15 +1100 Subject: [PATCH 1/2] Fix bans not expiring (FS-147) --- src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java index 36940683..42871f45 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java @@ -169,7 +169,7 @@ public class Ban public boolean isExpired() { - return hasExpiry() && expiryUnix < FUtil.getUnixTime(); + return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime())); } public String bakeKickMessage() From 9f291f675c91e28bdb9aeb554fbdc7acef304448 Mon Sep 17 00:00:00 2001 From: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Sun, 21 Mar 2021 13:44:55 +1100 Subject: [PATCH 2/2] Use 'toEpochMilli()' instead (FS-147) --- src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 361603c4..83d3c949 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -612,7 +612,7 @@ public class FUtil public static long getUnixTime() { - return Instant.now().getEpochSecond(); + return Instant.now().toEpochMilli(); } public static long getUnixTime(Date date)