AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into tfm-bugfix-001

Browse Source
This commit is contained in:
Nathan Curran 2021-03-21 16:11:13 +11:00 committed by GitHub
commit db3c190b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
View File

@ -169,7 +169,7 @@ public class Ban
public boolean isExpired() public boolean isExpired()
{ {
return hasExpiry() && expiryUnix < FUtil.getUnixTime(); return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime()));
} }
public String bakeKickMessage() public String bakeKickMessage()

2
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View File

@ -612,7 +612,7 @@ public class FUtil
public static long getUnixTime() public static long getUnixTime()
{ {
return Instant.now().getEpochSecond(); return Instant.now().toEpochMilli();
} }
public static long getUnixTime(Date date) public static long getUnixTime(Date date)