Merge branch 'development' into Wild1145-patch-1

This commit is contained in:
Ryan 2021-03-06 19:47:48 +00:00 committed by GitHub
commit 14c53b7370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -605,12 +605,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)
@ -620,7 +620,7 @@ public class FUtil
return 0;
}
return date.getTime() / 1000L;
return date.getTime();
}
public static String getNMSVersion()