Merge branch 'development' into abhi-test

This commit is contained in:
Ryan
2021-03-06 20:03:19 +00:00
committed by GitHub
3 changed files with 10 additions and 4 deletions

View File

@ -606,12 +606,12 @@ public class FUtil
public static Date getUnixDate(long unix)
{
return new Date(unix * 1000);
return new Date(unix);
}
public static long getUnixTime()
{
return System.currentTimeMillis() / 1000L;
return Instant.now().getEpochSecond();
}
public static long getUnixTime(Date date)
@ -621,7 +621,7 @@ public class FUtil
return 0;
}
return date.getTime() / 1000L;
return date.getTime();
}
public static String getNMSVersion()