mirror of
https://github.com/TotalFreedomMC/TotalFreedomMod.git
synced 2025-07-31 01:42:41 +00:00
Merge branch 'development' into Wild1145-patch-1
This commit is contained in:
commit
14c53b7370
1 changed files with 3 additions and 3 deletions
|
@ -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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue